Removed references to sdl from audiostream and genericndkbuild

Author: inclement

pythonforandroid/recipes/audiostream/__init__.py

@@ -7,18 +7,14 @@ class AudiostreamRecipe(CythonRecipe):
     version = 'master'
     url = 'https://github.com/kivy/audiostream/archive/{version}.zip'
     name = 'audiostream'
-    depends = [('python2', 'python3'), ('sdl', 'sdl2'), 'pyjnius']
+    depends = [('python2', 'python3'), 'sdl2', 'pyjnius']
 
     def get_recipe_env(self, arch):
         env = super(AudiostreamRecipe, self).get_recipe_env(arch)
-        if 'sdl' in self.ctx.recipe_build_order:
-            sdl_include = 'sdl'
-            sdl_mixer_include = 'sdl_mixer'
-        elif 'sdl2' in self.ctx.recipe_build_order:
-            sdl_include = 'SDL2'
-            sdl_mixer_include = 'SDL2_mixer'
-            env['USE_SDL2'] = 'True'
-            env['SDL2_INCLUDE_DIR'] = join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include')
+        sdl_include = 'SDL2'
+        sdl_mixer_include = 'SDL2_mixer'
+        env['USE_SDL2'] = 'True'
+        env['SDL2_INCLUDE_DIR'] = join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include')
 
         env['CFLAGS'] += ' -I{jni_path}/{sdl_include}/include -I{jni_path}/{sdl_mixer_include}'.format(
                               jni_path=join(self.ctx.bootstrap.build_dir, 'jni'),

pythonforandroid/recipes/genericndkbuild/__init__.py

@@ -8,7 +8,7 @@ class GenericNDKBuildRecipe(BootstrapNDKRecipe):
     url = None
 
     depends = [('python2', 'python3', 'python3crystax')]
-    conflicts = ['sdl2', 'sdl']
+    conflicts = ['sdl2']
 
     def should_build(self, arch):
         return True