diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-09-15 16:16:06 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2010-09-15 16:16:06 -0700 |
| commit | 747c5732f8165a0c53ba0e11635727ea83b3d3bb (patch) | |
| tree | a7c35e561bbafb335977e863c577718259c56451 /android | |
| parent | 5b048aea8927cc0747debab2c0c5b618d9871985 (diff) | |
| parent | 90f23688416d9f4e1e5d0128dca5f26404b6898e (diff) | |
resolved conflicts for merge of 90f23688 to master
Change-Id: Ifa97db751da1aeeeb9d7450b04c909f0800ce140
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/android/Android.mk b/android/Android.mk index 9016f31..151a5cb 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -1,22 +1,31 @@ LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ +libsqlite3_android_local_src_files := \ PhoneNumberUtils.cpp \ PhoneticStringUtils.cpp \ OldPhoneNumberUtils.cpp \ PhonebookIndex.cpp \ sqlite3_android.cpp -LOCAL_C_INCLUDES := \ +libsqlite3_android_c_includes := \ external/sqlite/dist \ external/icu4c/i18n \ external/icu4c/common +include $(CLEAR_VARS) +LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files) +LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes) LOCAL_MODULE:= libsqlite3_android - include $(BUILD_STATIC_LIBRARY) +ifeq ($(WITH_HOST_DALVIK),true) + include $(CLEAR_VARS) + LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files) + LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes) + LOCAL_MODULE:= libsqlite3_android + include $(BUILD_HOST_STATIC_LIBRARY) +endif + # Test for PhoneticStringUtils include $(CLEAR_VARS) |