allow setting LOCAL_STRIP_MODULE on multi_prebuilts
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
This commit is contained in:
parent
19b22a9413
commit
e1a8e3aef3
@ -22,6 +22,7 @@ prebuilt_java_libraries := $(LOCAL_PREBUILT_JAVA_LIBRARIES)
|
|||||||
prebuilt_static_java_libraries := $(LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES)
|
prebuilt_static_java_libraries := $(LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES)
|
||||||
prebuilt_is_host := $(LOCAL_IS_HOST_MODULE)
|
prebuilt_is_host := $(LOCAL_IS_HOST_MODULE)
|
||||||
prebuilt_module_tags := $(LOCAL_MODULE_TAGS)
|
prebuilt_module_tags := $(LOCAL_MODULE_TAGS)
|
||||||
|
prebuilt_strip_module := $(LOCAL_STRIP_MODULE)
|
||||||
|
|
||||||
|
|
||||||
ifndef multi_prebuilt_once
|
ifndef multi_prebuilt_once
|
||||||
@ -34,6 +35,7 @@ multi_prebuilt_once := true
|
|||||||
# $(5): OVERRIDE_BUILT_MODULE_PATH
|
# $(5): OVERRIDE_BUILT_MODULE_PATH
|
||||||
# $(6): UNINSTALLABLE_MODULE
|
# $(6): UNINSTALLABLE_MODULE
|
||||||
# $(7): BUILT_MODULE_STEM
|
# $(7): BUILT_MODULE_STEM
|
||||||
|
# $(8): LOCAL_STRIP_MODULE
|
||||||
#
|
#
|
||||||
# Elements in the file list may be bare filenames,
|
# Elements in the file list may be bare filenames,
|
||||||
# or of the form "<modulename>:<filename>".
|
# or of the form "<modulename>:<filename>".
|
||||||
@ -65,6 +67,8 @@ $(foreach t,$(1), \
|
|||||||
$(eval LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))) \
|
$(eval LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))) \
|
||||||
) \
|
) \
|
||||||
$(eval LOCAL_MODULE_SUFFIX := $(suffix $(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)) \
|
$(eval include $(BUILD_PREBUILT)) \
|
||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
@ -85,7 +89,10 @@ $(call auto-prebuilt-boilerplate, \
|
|||||||
$(prebuilt_is_host), \
|
$(prebuilt_is_host), \
|
||||||
SHARED_LIBRARIES, \
|
SHARED_LIBRARIES, \
|
||||||
$(prebuilt_module_tags), \
|
$(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, \
|
$(call auto-prebuilt-boilerplate, \
|
||||||
$(prebuilt_executables), \
|
$(prebuilt_executables), \
|
||||||
|
Loading…
Reference in New Issue
Block a user