diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-05 11:35:01 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-01-05 11:35:01 +0000 |
| commit | 22d8f5b9a29ea46bc522e585acdf0e3c2a5334bd (patch) | |
| tree | ce5a3e0471637fe31e7d31bbc9cd0e916252d680 | |
| parent | a561e9ca8cdfd3c6a7cea00661f486f0b3394f43 (diff) | |
| download | android_external_sqlite-22d8f5b9a29ea46bc522e585acdf0e3c2a5334bd.tar.gz android_external_sqlite-22d8f5b9a29ea46bc522e585acdf0e3c2a5334bd.tar.bz2 android_external_sqlite-22d8f5b9a29ea46bc522e585acdf0e3c2a5334bd.zip | |
Remove hardcoded ICU include paths.
ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS.
bug: 18581021
Change-Id: I98048a4f6a9163fff6d3a71712d8249b2b00d04b
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | android/Android.mk | 11 | ||||
| -rw-r--r-- | dist/Android.mk | 10 |
3 files changed, 10 insertions, 14 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 185d0c1..06c44da 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -52,3 +52,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libsqlite_inte $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libsqlite3_android_intermediates/import_includes) $(call add-clean-step, rm -rf $(HOST_OUT)/obj/STATIC_LIBRARIES/libsqlite3_android_intermediates/import_includes) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libsqlite_intermediates) + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libsqlite3_android_intermediates/import_includes) +$(call add-clean-step, rm -rf $(HOST_OUT)/obj/STATIC_LIBRARIES/libsqlite3_android_intermediates/import_includes) diff --git a/android/Android.mk b/android/Android.mk index 1e8718b..c7cc6d6 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -5,22 +5,21 @@ libsqlite3_android_local_src_files := \ OldPhoneNumberUtils.cpp \ sqlite3_android.cpp -libsqlite3_android_c_includes := \ - external/sqlite/dist \ - external/icu/icu4c/source/i18n \ - external/icu/icu4c/source/common +libsqlite3_android_c_includes := external/sqlite/dist include $(CLEAR_VARS) LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files) -LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes) +LOCAL_C_INCLUDES += $(libsqlite3_android_c_includes) LOCAL_STATIC_LIBRARIES := liblog +LOCAL_SHARED_LIBRARIES := libicuuc libicui18n LOCAL_MODULE:= libsqlite3_android include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files) -LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes) +LOCAL_C_INCLUDES += $(libsqlite3_android_c_includes) LOCAL_STATIC_LIBRARIES := liblog +LOCAL_SHARED_LIBRARIES := libicuuc-host libicui18n-host LOCAL_MODULE:= libsqlite3_android include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/dist/Android.mk b/dist/Android.mk index 02c2409..da4eba2 100644 --- a/dist/Android.mk +++ b/dist/Android.mk @@ -50,10 +50,7 @@ LOCAL_SHARED_LIBRARIES := libdl LOCAL_MODULE:= libsqlite -LOCAL_C_INCLUDES += \ - $(call include-path-for, system-core)/cutils \ - external/icu/icu4c/source/i18n \ - external/icu/icu4c/source/common +LOCAL_C_INCLUDES += $(call include-path-for, system-core)/cutils LOCAL_SHARED_LIBRARIES += liblog \ libicuuc \ @@ -92,9 +89,7 @@ LOCAL_SRC_FILES := shell.c LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../android \ - $(call include-path-for, system-core)/cutils \ - external/icu4c/i18n \ - external/icu4c/common + $(call include-path-for, system-core)/cutils LOCAL_SHARED_LIBRARIES := libsqlite \ libicuuc \ @@ -123,7 +118,6 @@ endif # !SDK_ONLY include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_src_files) shell.c - LOCAL_CFLAGS += $(host_sqlite_flags) \ -DNO_ANDROID_FUNCS=1 |