diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-24 23:04:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 23:04:46 +0000 |
| commit | 3b023915e8374341c6a69cd40b0811e10b3cb1b5 (patch) | |
| tree | cb4394657b1ee6e1976a3a02c1d8fbf1cb9ab0af | |
| parent | cae4652514c220d1b8d9fbbdca1204bc6cb25954 (diff) | |
| parent | 4fa4e4befd5bc88ab37d7c7b20d3a67d351a1925 (diff) | |
| download | build-3b023915e8374341c6a69cd40b0811e10b3cb1b5.zip build-3b023915e8374341c6a69cd40b0811e10b3cb1b5.tar.gz build-3b023915e8374341c6a69cd40b0811e10b3cb1b5.tar.bz2 | |
am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '4fa4e4befd5bc88ab37d7c7b20d3a67d351a1925':
Do not pack relocations for prebuilts by default
| -rw-r--r-- | core/prebuilt_internal.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 0a0a2ff..f85b0b8 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -43,6 +43,11 @@ ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) # Strip but not try to add debuglink LOCAL_STRIP_MODULE := no_debuglink endif + + ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_PACK_MODULE_RELOCATIONS),) + # Do not pack relocations by default + LOCAL_PACK_MODULE_RELOCATIONS := false + endif endif ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),) @@ -63,20 +68,20 @@ LOCAL_BUILT_MODULE_STEM := package.apk LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk endif -ifneq ($(filter true no_debuglink,$(LOCAL_STRIP_MODULE)),) +ifneq ($(filter true no_debuglink,$(LOCAL_STRIP_MODULE) $(LOCAL_PACK_MODULE_RELOCATIONS)),) ifdef LOCAL_IS_HOST_MODULE - $(error Cannot strip host module LOCAL_PATH=$(LOCAL_PATH)) + $(error Cannot strip/pack host module LOCAL_PATH=$(LOCAL_PATH)) endif ifeq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),) - $(error Can strip only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH)) + $(error Can strip/pack only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH)) endif ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) - $(error Cannot strip scripts LOCAL_PATH=$(LOCAL_PATH)) + $(error Cannot strip/pack scripts LOCAL_PATH=$(LOCAL_PATH)) endif include $(BUILD_SYSTEM)/dynamic_binary.mk built_module := $(linked_module) -else # LOCAL_STRIP_MODULE not true +else # LOCAL_STRIP_MODULE and LOCAL_PACK_MODULE_RELOCATIONS not true include $(BUILD_SYSTEM)/base_rules.mk built_module := $(LOCAL_BUILT_MODULE) |