StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"

Browse Source 
* commit '3b023915e8374341c6a69cd40b0811e10b3cb1b5':
  Do not pack relocations for prebuilts by default
This commit is contained in:
Dmitriy Ivanov
2015-04-24 23:14:00 +00:00
committed by Android Git Automerger
parent 513be561e9 3b023915e8
commit df7afb47d8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/prebuilt_internal.mk
View File

@@ -43,6 +43,11 @@ ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS))
# Strip but not try to add debuglink # Strip but not try to add debuglink
LOCAL_STRIP_MODULE := no_debuglink LOCAL_STRIP_MODULE := no_debuglink
endif endif
ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_PACK_MODULE_RELOCATIONS),)
# Do not pack relocations by default
LOCAL_PACK_MODULE_RELOCATIONS := false
endif
endif endif
ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),) 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 LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk
endif 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 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 endif
ifeq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),) 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 endif
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(error Cannot strip scripts LOCAL_PATH=$(LOCAL_PATH)) $(error Cannot strip/pack scripts LOCAL_PATH=$(LOCAL_PATH))
endif endif
include $(BUILD_SYSTEM)/dynamic_binary.mk include $(BUILD_SYSTEM)/dynamic_binary.mk
built_module := $(linked_module) 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 include $(BUILD_SYSTEM)/base_rules.mk
built_module := $(LOCAL_BUILT_MODULE) built_module := $(LOCAL_BUILT_MODULE)