Skip to content

Commit d0ee0dc

Browse files
committed
modify sqlite3 flags;
remove unused ssl patch;
1 parent 6351d8b commit d0ee0dc

File tree

4 files changed

+4
-26
lines changed

4 files changed

+4
-26
lines changed

pythonforandroid/recipes/python2/Setup.local-ssl

Lines changed: 0 additions & 4 deletions
This file was deleted.

pythonforandroid/recipes/python2/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ def build_arch(self, arch):
6868
# return
6969

7070
def do_python_build(self, arch):
71-
if 'sqlite' in self.ctx.recipe_build_order:
72-
print('sqlite support not yet enabled in python recipe')
73-
exit(1)
7471

7572
hostpython_recipe = Recipe.get_recipe('hostpython2', self.ctx)
7673
shprint(sh.cp, self.ctx.hostpython, self.get_build_dir(arch.arch))
@@ -109,7 +106,7 @@ def do_python_build(self, arch):
109106
'SQLITE=' + Recipe.get_recipe('sqlite3', self.ctx).get_build_dir(arch.arch) + '\n',
110107
'sqlite3 sqlite3.c -DSQLITE_ENABLE_FTS4',
111108
' -I$(SQLITE)',
112-
' -L$(SQLITE)/obj/local/' + arch.arch + ' -lsqlite3',
109+
' -L$(SQLITE)/obj/local/' + arch.arch + '/objs -lsqlite3',
113110
'\n'])
114111
file.close()
115112

pythonforandroid/recipes/python2/patches/enable-ssl.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

pythonforandroid/recipes/sqlite3/Android.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ LOCAL_PATH := $(call my-dir)/..
22

33
include $(CLEAR_VARS)
44

5+
LOCAL_MODULE := sqlite3
6+
57
LOCAL_SRC_FILES := sqlite3.c
68

7-
LOCAL_MODULE := sqlite3
9+
LOCAL_CFLAGS := -DSQLITE_ENABLE_FTS4
810

911
include $(BUILD_SHARED_LIBRARY)

0 commit comments

Comments
 (0)