Merge "Remove bcp_dep."
This commit is contained in:
commit
6d6d9a8052
1 changed files with 1 additions and 10 deletions
|
|
@ -146,13 +146,7 @@ endif
|
||||||
|
|
||||||
include $(BUILD_SYSTEM)/base_rules.mk
|
include $(BUILD_SYSTEM)/base_rules.mk
|
||||||
|
|
||||||
# Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH has changed.
|
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in
|
||||||
bcp_md5 := $(word 1, $(shell echo $(PRODUCT_BOOTCLASSPATH) $(PRODUCT_SYSTEM_SERVER_CLASSPATH) | $(MD5SUM)))
|
|
||||||
bcp_dep := $(intermediates)/$(bcp_md5).bcp.dep
|
|
||||||
$(bcp_dep) :
|
|
||||||
$(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.bcp.dep && touch $@
|
|
||||||
|
|
||||||
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep)
|
|
||||||
@echo "Generate: $< -> $@"
|
@echo "Generate: $< -> $@"
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@
|
$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@
|
||||||
|
|
@ -161,9 +155,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep)
|
||||||
$(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@
|
$(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@
|
||||||
$(hide) sed -i -e 's?%EXPORT_GLOBAL_HWASAN_OPTIONS%?$(EXPORT_GLOBAL_HWASAN_OPTIONS)?g' $@
|
$(hide) sed -i -e 's?%EXPORT_GLOBAL_HWASAN_OPTIONS%?$(EXPORT_GLOBAL_HWASAN_OPTIONS)?g' $@
|
||||||
|
|
||||||
bcp_md5 :=
|
|
||||||
bcp_dep :=
|
|
||||||
|
|
||||||
# Append PLATFORM_VNDK_VERSION to base name.
|
# Append PLATFORM_VNDK_VERSION to base name.
|
||||||
define append_vndk_version
|
define append_vndk_version
|
||||||
$(strip \
|
$(strip \
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue