diff options
| author | Ying Wang <wangying@google.com> | 2014-05-08 11:16:29 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-08 11:16:29 -0700 |
| commit | 9dd601de3e5ebeea9d88ffc57a8ba1ec91ff3c6e (patch) | |
| tree | c085b56b2004e7ee99f574084513fde04b42217d | |
| parent | 79a958ee9766577e9d517cf415df06c2ff8bda3a (diff) | |
| parent | dd893338051cbd5c78c5b2bed179f47760a7ff14 (diff) | |
resolved conflicts for merge of dd893338 to master
Change-Id: I7d1f542121dcb7f54fa53f19f46ed6723b618741
| -rw-r--r-- | dist/Android.mk | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/dist/Android.mk b/dist/Android.mk index 26c4e2a..922d627 100644 --- a/dist/Android.mk +++ b/dist/Android.mk @@ -44,10 +44,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_src_files) -ifneq ($(TARGET_ARCH),arm) -LOCAL_LDLIBS += -lpthread -ldl -endif - LOCAL_CFLAGS += $(device_sqlite_flags) LOCAL_SHARED_LIBRARIES := libdl @@ -107,10 +103,6 @@ LOCAL_SHARED_LIBRARIES := libsqlite \ libicui18n \ libutils -ifneq ($(TARGET_ARCH),arm) -LOCAL_LDLIBS += -lpthread -ldl -endif - LOCAL_CFLAGS += $(device_sqlite_flags) LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) |