Merge pull request #1000 from kivy/fix_sqlite3_blacklist

Fixed the blacklisting of sqlite3 under sdl2
kivy · Jan 28, 2017 · 924d00b · 924d00b
2 parents 6d19a6d + 4a4ca8d
commit 924d00b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -111,6 +111,9 @@ def run_distribute(self):
                     shprint(sh.mv, filen, filen.split('.')[0] + '.so')
                 site_packages_dir = join(abspath(curdir),
                                          site_packages_dir)
+            if 'sqlite3' not in self.ctx.recipe_build_order:
+                with open('blacklist.txt', 'a') as fileh:
+                    fileh.write('\nsqlite3/*\nlib-dynload/_sqlite3.so\n')
 
 
         self.strip_libraries(arch)

diff --git a/pythonforandroid/bootstraps/sdl2/build/blacklist.txt b/pythonforandroid/bootstraps/sdl2/build/blacklist.txt
@@ -81,10 +81,3 @@ lib-dynload/_testcapi.so
 
 # odd files
 plat-linux3/regen
-
-#>sqlite3
-# conditionnal include depending if some recipes are included or not.
-sqlite3/*
-lib-dynload/_sqlite3.so
-#<sqlite3
-