diff options
| author | Narayan Kamath <narayan@google.com> | 2016-01-08 11:13:56 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-01-11 16:20:57 -0800 |
| commit | 2f71e84b2444bb69a3dd433ee7ef17732ee45bd3 (patch) | |
| tree | aee538e1a54bdf71faa95edf5c40973dec11057d | |
| parent | 650e47f3d5e7dc9edb48f20a598d938500267819 (diff) | |
| download | javasqlite-nougat-cts-release.tar.gz | |
Depend on the static version of libsqlite_static_minimal.android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-cts-releasenougat-bugfix-release
libsqlite is a system library and we shouldn't rely on it being
available from a CTS package.
Also, build the target version of libsqlite_jni using NDK headers.
bug: 26457850
Change-Id: Ifbd7dc09dacd26b4f6962287660748adfdf10df1
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -18,10 +18,11 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := $(sqlite_cflags) LOCAL_SRC_FILES := $(sqlite_jdbc_src_files) LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes) -LOCAL_SHARED_LIBRARIES += libsqlite +LOCAL_STATIC_LIBRARIES += libsqlite_static_minimal LOCAL_MODULE_TAGS := optional # This name is dictated by the fact that the SQLite code calls loadLibrary("sqlite_jni"). LOCAL_MODULE := libsqlite_jni +LOCAL_SDK_VERSION := 23 include $(BUILD_SHARED_LIBRARY) ifeq ($(HOST_OS),linux) @@ -36,7 +37,7 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := $(sqlite_cflags) LOCAL_SRC_FILES := $(sqlite_jdbc_src_files) LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes) -LOCAL_SHARED_LIBRARIES += libsqlite +LOCAL_STATIC_LIBRARIES += libsqlite_static_minimal LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libsqlite_jni include $(BUILD_HOST_SHARED_LIBRARY) |