Merge pull request #1715 from j-devel/fix-android-setuppy-non-sdl

AndreMiras · web-flow · commit 6ca419e4ca96 · 2019-02-18T10:26:08.000Z
Fix compile error of recipe "android" for non-sdl bootstrap build
diff --git a/pythonforandroid/recipes/android/src/setup.py b/pythonforandroid/recipes/android/src/setup.py
@@ -6,7 +6,7 @@
     'pygame': ['sdl'],
     'sdl2': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf']
 }
-sdl_libs = lib_dict[os.environ['BOOTSTRAP']]
+sdl_libs = lib_dict.get(os.environ['BOOTSTRAP'], [])
 
 renpy_sound = Extension('android._android_sound',
                         ['android/_android_sound.c', 'android/_android_sound_jni.c', ],

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`'pygame': ['sdl'],`
`7`	`7`	`'sdl2': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf']`
`8`	`8`	`}`
`9`		`-sdl_libs = lib_dict[os.environ['BOOTSTRAP']]`
	`9`	`+sdl_libs = lib_dict.get(os.environ['BOOTSTRAP'], [])`
`10`	`10`
`11`	`11`	`renpy_sound = Extension('android._android_sound',`
`12`	`12`	`['android/_android_sound.c', 'android/_android_sound_jni.c', ],`