p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use order-only dependencies for symbols files" am: b847012f3b am: 39c14920b1 

Original change: https://android-review.googlesource.com/c/platform/build/+/1688962

Change-Id: I25ab79b5897db0f183fa86128bf9e891449dfaaf
This commit is contained in:
Colin Cross 2021-04-30 15:06:28 +00:00 committed by Automerger Merge Worker
parent 5fd18b8f7b 39c14920b1
commit 799ecd9969
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_libart.mk
View File

@ -68,7 +68,7 @@ ifneq (,$(my_copy_pairs))
endif
LOCAL_MODULE_CLASS := ETC
include $(BUILD_PREBUILT)
$(LOCAL_BUILT_MODULE): $(my_unstripped_installed)
$(LOCAL_BUILT_MODULE): | $(my_unstripped_installed)
# Installing boot.art causes all boot image bits to be installed.
# Keep this old behavior in case anyone still needs it.
$(LOCAL_INSTALLED_MODULE): $(my_installed)

7
core/dynamic_binary.mk
View File

@ -87,9 +87,14 @@ endif
###########################################################
## Strip
###########################################################
strip_input := $(symbolic_output)
strip_input := $(inject_module)
strip_output := $(LOCAL_BUILT_MODULE)
# Use an order-only dependency to ensure the unstripped file in the symbols
# directory is copied when the module is built, but does not force the
# module to be rebuilt when the symbols directory is cleaned by installclean.
$(strip_output): | $(symbolic_output)
my_strip_module := $(firstword \
$(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \
$(LOCAL_STRIP_MODULE))

2
core/soong_app_prebuilt.mk
View File

@ -147,7 +147,7 @@ endif
# install symbol files of JNI libraries
my_jni_lib_symbols_copy_files := $(foreach f,$(LOCAL_SOONG_JNI_LIBS_SYMBOLS),\
$(call word-colon,1,$(f)):$(patsubst $(PRODUCT_OUT)/%,$(TARGET_OUT_UNSTRIPPED)/%,$(call word-colon,2,$(f))))
$(LOCAL_BUILT_MODULE): $(call copy-many-files, $(my_jni_lib_symbols_copy_files))
$(LOCAL_BUILT_MODULE): | $(call copy-many-files, $(my_jni_lib_symbols_copy_files))
# embedded JNI will already have been handled by soong
my_embed_jni :=

2
core/soong_cc_prebuilt.mk
View File

@ -170,7 +170,7 @@ ifndef LOCAL_IS_HOST_MODULE
my_unstripped_path := $(patsubst $(TARGET_OUT_UNSTRIPPED)/root/%,$(TARGET_OUT_UNSTRIPPED)/%, $(my_unstripped_path))
symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem)
$(eval $(call copy-one-file,$(LOCAL_SOONG_UNSTRIPPED_BINARY),$(symbolic_output)))
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(symbolic_output))
$(LOCAL_BUILT_MODULE): | $(symbolic_output)
ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)
my_breakpad_path := $(TARGET_OUT_BREAKPAD)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_symbol_path))

2
core/soong_rust_prebuilt.mk
View File

@ -119,7 +119,7 @@ ifndef LOCAL_IS_HOST_MODULE
my_unstripped_path := $(patsubst $(TARGET_OUT_UNSTRIPPED)/root/%,$(TARGET_OUT_UNSTRIPPED)/%, $(my_unstripped_path))
symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem)
$(eval $(call copy-one-file,$(LOCAL_SOONG_UNSTRIPPED_BINARY),$(symbolic_output)))
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(symbolic_output))
$(LOCAL_BUILT_MODULE): | $(symbolic_output)
endif
endif