diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-24 15:33:14 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-24 15:33:14 -0700 |
| commit | 64762c302746f706232198f6cce69487e70432fe (patch) | |
| tree | 4f468f876a0ebda278a954acff32eb0c174861e5 /core/prebuilt_internal.mk | |
| parent | b1c2727aecfbd769bc002e1feeea0f6b745c9795 (diff) | |
| download | build-64762c302746f706232198f6cce69487e70432fe.zip build-64762c302746f706232198f6cce69487e70432fe.tar.gz build-64762c302746f706232198f6cce69487e70432fe.tar.bz2 | |
Do not pack relocations for prebuilts by default
Do not pack relocations for prebuilds unless
LOCAL_PACK_MODULE_RELOCATIONS is true
Bug: http://b/20537715
Bug: http://b/18051137
Change-Id: Iddef3b09741da6ae10d73c98103b868cc7695d38
Diffstat (limited to 'core/prebuilt_internal.mk')
| -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) |