diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 20:53:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 20:53:33 +0000 |
| commit | bdaef3e5e843de8981653e3c8b6913999cf6576f (patch) | |
| tree | b570304587e1d1c0813fe30f659e97ca328558af | |
| parent | 67a679dea9539abc3b97cdcb05480c0ffd78669b (diff) | |
| parent | 3ce5de3a19b530bbb06bdbfc93666c5307b135a2 (diff) | |
| download | gps-bdaef3e5e843de8981653e3c8b6913999cf6576f.tar.gz | |
am 3ce5de3a: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '3ce5de3a19b530bbb06bdbfc93666c5307b135a2':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
| -rw-r--r-- | core/Android.mk | 1 | ||||
| -rw-r--r-- | loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk | 1 | ||||
| -rw-r--r-- | loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk | 1 | ||||
| -rw-r--r-- | loc_api/libloc_api_50001/Android.mk | 2 | ||||
| -rw-r--r-- | msm8960/core/Android.mk | 1 | ||||
| -rw-r--r-- | msm8960/loc_api/libloc_api_50001/Android.mk | 2 | ||||
| -rw-r--r-- | msm8960/utils/Android.mk | 1 | ||||
| -rw-r--r-- | utils/Android.mk | 1 |
8 files changed, 0 insertions, 10 deletions
diff --git a/core/Android.mk b/core/Android.mk index 3e2b2eb..d326d90 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -45,7 +45,6 @@ LOCAL_COPY_HEADERS:= \ loc_core_log.h \ LocAdapterProxyBase.h -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) diff --git a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk index bb3d924..58ad37e 100644 --- a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk +++ b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk @@ -31,7 +31,6 @@ LOCAL_SHARED_LIBRARIES:= \ LOCAL_STATIC_LIBRARIES := \ libloc_api_rpcgen -LOCAL_PRELINK_MODULE:= false LOCAL_C_INCLUDES:= \ $(LOCAL_PATH) \ diff --git a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk index c0987e6..1f542e4 100644 --- a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk +++ b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk @@ -32,5 +32,4 @@ LOCAL_COPY_HEADERS += inc/loc_api_rpcgen_cb_rpc.h LOCAL_COPY_HEADERS += inc/loc_apicb_appinit.h LOCAL_LDLIBS += -lpthread -LOCAL_PRELINK_MODULE := false include $(BUILD_STATIC_LIBRARY) diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk index c43fe47..4ef3c50 100644 --- a/loc_api/libloc_api_50001/Android.mk +++ b/loc_api/libloc_api_50001/Android.mk @@ -54,7 +54,6 @@ LOCAL_COPY_HEADERS:= \ loc_eng_msg.h \ loc_eng_log.h -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) @@ -97,7 +96,6 @@ ifneq ($(filter msm8084,$(TARGET_BOARD_PLATFORM)),) LOCAL_CFLAGS += -DPLATFORM_MSM8084 endif -LOCAL_PRELINK_MODULE := false LOCAL_MODULE_RELATIVE_PATH := hw include $(BUILD_SHARED_LIBRARY) diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk index c8a5fd4..5dcf8b7 100644 --- a/msm8960/core/Android.mk +++ b/msm8960/core/Android.mk @@ -41,6 +41,5 @@ LOCAL_COPY_HEADERS:= \ gps_extended.h \ loc_core_log.h -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) diff --git a/msm8960/loc_api/libloc_api_50001/Android.mk b/msm8960/loc_api/libloc_api_50001/Android.mk index 98a67b4..5d29c58 100644 --- a/msm8960/loc_api/libloc_api_50001/Android.mk +++ b/msm8960/loc_api/libloc_api_50001/Android.mk @@ -54,7 +54,6 @@ LOCAL_COPY_HEADERS:= \ loc_eng_msg.h \ loc_eng_log.h -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) @@ -93,7 +92,6 @@ LOCAL_C_INCLUDES:= \ $(TARGET_OUT_HEADERS)/gps.utils \ $(TARGET_OUT_HEADERS)/libloc_core -LOCAL_PRELINK_MODULE := false LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw include $(BUILD_SHARED_LIBRARY) diff --git a/msm8960/utils/Android.mk b/msm8960/utils/Android.mk index 18c7ccc..14688a7 100644 --- a/msm8960/utils/Android.mk +++ b/msm8960/utils/Android.mk @@ -48,7 +48,6 @@ LOCAL_MODULE := libgps.utils LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) include $(BUILD_SHARED_LIBRARY) diff --git a/utils/Android.mk b/utils/Android.mk index f34e101..f55caaf 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -54,7 +54,6 @@ LOCAL_MODULE := libgps.utils LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) endif # not BUILD_TINY_ANDROID |