diff options
| author | Ying Wang <wangying@google.com> | 2011-01-07 12:56:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-07 12:56:23 -0800 |
| commit | 102b7bc9eba929d763c60c5c7467d2f9a529bf66 (patch) | |
| tree | 96b92900ff2d7e3c1bd0a8c140ee5938cfac5146 | |
| parent | 1c76910f0a0fb0cb761a4505f3be1204d6be012b (diff) | |
| parent | 97ba1ff9369e4bab7e6fdfd0c286f52c7a7d5ecc (diff) | |
| download | libcore-102b7bc9eba929d763c60c5c7467d2f9a529bf66.tar.gz | |
Merge "TARGET_PRELINK_MODULE should not be modified in module's definition" into gingerbread
| -rw-r--r-- | sqlite-jdbc/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sqlite-jdbc/Android.mk b/sqlite-jdbc/Android.mk index d0421874c1f..8cc23ce97c5 100644 --- a/sqlite-jdbc/Android.mk +++ b/sqlite-jdbc/Android.mk @@ -15,7 +15,7 @@ LOCAL_SHARED_LIBRARIES += libsqlite LOCAL_MODULE_TAGS := optional # This name is dictated by the fact that the SQLite code calls loadLibrary("sqlite_jni"). LOCAL_MODULE := libsqlite_jni -TARGET_PRELINK_MODULE := false +LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) ifeq ($(WITH_HOST_DALVIK),true) @@ -25,6 +25,6 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_SHARED_LIBRARIES += libsqlite LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libsqlite_jni - TARGET_PRELINK_MODULE := false + LOCAL_PRELINK_MODULE := false include $(BUILD_HOST_SHARED_LIBRARY) endif |