diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-28 16:03:25 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-28 16:03:25 -0700 |
| commit | e136f298d5e86a0bd995d998692bd2a6cdefcc3d (patch) | |
| tree | 3be2ae74314e6922357a25c05e5503918b98945c | |
| parent | 9dd601de3e5ebeea9d88ffc57a8ba1ec91ff3c6e (diff) | |
| parent | f7e7b75facd548b8966db6ef95c39bb0b63127c1 (diff) | |
| download | android_external_sqlite-e136f298d5e86a0bd995d998692bd2a6cdefcc3d.tar.gz android_external_sqlite-e136f298d5e86a0bd995d998692bd2a6cdefcc3d.tar.bz2 android_external_sqlite-e136f298d5e86a0bd995d998692bd2a6cdefcc3d.zip | |
resolved conflicts for merge of f7e7b75f to master
Change-Id: I8e622c411fbd176372b657f9e1fec9402e14db65
| -rw-r--r-- | android/Android.mk | 14 | ||||
| -rw-r--r-- | dist/Android.mk | 24 |
2 files changed, 17 insertions, 21 deletions
diff --git a/android/Android.mk b/android/Android.mk index ce346b4..38f136d 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -17,14 +17,12 @@ LOCAL_STATIC_LIBRARIES := liblog 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_STATIC_LIBRARIES := liblog - LOCAL_MODULE:= libsqlite3_android - include $(BUILD_HOST_STATIC_LIBRARY) -endif +include $(CLEAR_VARS) +LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files) +LOCAL_C_INCLUDES := $(libsqlite3_android_c_includes) +LOCAL_STATIC_LIBRARIES := liblog +LOCAL_MODULE:= libsqlite3_android +include $(BUILD_HOST_STATIC_LIBRARY) # Test for PhoneNumberUtils # diff --git a/dist/Android.mk b/dist/Android.mk index 922d627..05bb2fa 100644 --- a/dist/Android.mk +++ b/dist/Android.mk @@ -67,19 +67,17 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libsqlite3_android include $(BUILD_SHARED_LIBRARY) -ifeq ($(WITH_HOST_DALVIK),true) - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(common_src_files) - LOCAL_LDLIBS += -lpthread -ldl - LOCAL_CFLAGS += $(host_sqlite_flags) - LOCAL_MODULE:= libsqlite - LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host - LOCAL_STATIC_LIBRARIES := liblog libutils libcutils - - # include android specific methods - LOCAL_WHOLE_STATIC_LIBRARIES := libsqlite3_android - include $(BUILD_HOST_SHARED_LIBRARY) -endif +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(common_src_files) +LOCAL_LDLIBS += -lpthread -ldl +LOCAL_CFLAGS += $(host_sqlite_flags) +LOCAL_MODULE:= libsqlite +LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host +LOCAL_STATIC_LIBRARIES := liblog libutils libcutils + +# include android specific methods +LOCAL_WHOLE_STATIC_LIBRARIES := libsqlite3_android +include $(BUILD_HOST_SHARED_LIBRARY) ## ## |