summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2011-09-02 16:12:56 -0700
committerDoug Zongker <dougz@android.com>2011-09-06 10:31:37 -0700
commite1a8e3aef3834e8b451f2f8ae465c47ed58aba00 (patch)
tree598165d90e179db67c005524aa344fb2910215a0
parent19b22a94132e3ef670d87a045afb64cfd00c13b6 (diff)
downloadbuild-e1a8e3aef3834e8b451f2f8ae465c47ed58aba00.tar.gz
build-e1a8e3aef3834e8b451f2f8ae465c47ed58aba00.tar.bz2
build-e1a8e3aef3834e8b451f2f8ae465c47ed58aba00.zip
allow setting LOCAL_STRIP_MODULE on multi_prebuilts
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
-rw-r--r--core/multi_prebuilt.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/multi_prebuilt.mk b/core/multi_prebuilt.mk
index 760267352..50a4a380c 100644
--- a/core/multi_prebuilt.mk
+++ b/core/multi_prebuilt.mk
@@ -22,6 +22,7 @@ prebuilt_java_libraries := $(LOCAL_PREBUILT_JAVA_LIBRARIES)
prebuilt_static_java_libraries := $(LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES)
prebuilt_is_host := $(LOCAL_IS_HOST_MODULE)
prebuilt_module_tags := $(LOCAL_MODULE_TAGS)
+prebuilt_strip_module := $(LOCAL_STRIP_MODULE)
ifndef multi_prebuilt_once
@@ -34,6 +35,7 @@ multi_prebuilt_once := true
# $(5): OVERRIDE_BUILT_MODULE_PATH
# $(6): UNINSTALLABLE_MODULE
# $(7): BUILT_MODULE_STEM
+# $(8): LOCAL_STRIP_MODULE
#
# Elements in the file list may be bare filenames,
# or of the form "<modulename>:<filename>".
@@ -65,6 +67,8 @@ $(foreach t,$(1), \
$(eval LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))) \
) \
$(eval LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES))) \
+ $(if $(filter user,$(TARGET_BUILD_VARIANT)), \
+ $(eval LOCAL_STRIP_MODULE := $(8))) \
$(eval include $(BUILD_PREBUILT)) \
)
endef
@@ -85,7 +89,10 @@ $(call auto-prebuilt-boilerplate, \
$(prebuilt_is_host), \
SHARED_LIBRARIES, \
$(prebuilt_module_tags), \
- $($(if $(prebuilt_is_host),HOST,TARGET)_OUT_INTERMEDIATE_LIBRARIES))
+ $($(if $(prebuilt_is_host),HOST,TARGET)_OUT_INTERMEDIATE_LIBRARIES), \
+ , \
+ , \
+ $(prebuilt_strip_module))
$(call auto-prebuilt-boilerplate, \
$(prebuilt_executables), \