diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-07 09:51:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-07 09:51:22 +0000 |
| commit | c431c43f8d539343ade4c8e9e906a532b915c71d (patch) | |
| tree | bf5e1a5a67d4853427f8d4b2486792af5ef730d5 /rootdir/Android.mk | |
| parent | a7e2a12d388cf9e02bb1f73c789fb03960eccdfa (diff) | |
| parent | 74857cccd2d7de08c74ec8a5b882cc00fefbf9f8 (diff) | |
| download | system_core-c431c43f8d539343ade4c8e9e906a532b915c71d.tar.gz system_core-c431c43f8d539343ade4c8e9e906a532b915c71d.tar.bz2 system_core-c431c43f8d539343ade4c8e9e906a532b915c71d.zip | |
Merge "Remove *.dep files for ld.config.txt, [llndk|vndksp].libraries.txt"
Diffstat (limited to 'rootdir/Android.mk')
| -rw-r--r-- | rootdir/Android.mk | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index aa970d6a7..560092e86 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -206,10 +206,6 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(LOCAL_MODULE) include $(BUILD_SYSTEM)/base_rules.mk -vndk_lib_md5 := $(word 1, $(shell echo $(LLNDK_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) | $(MD5SUM))) -vndk_lib_dep := $(intermediates)/$(vndk_lib_md5).dep -$(vndk_lib_dep): - $(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.dep && touch $@ llndk_libraries := $(subst $(space),:,$(addsuffix .so,$(LLNDK_LIBRARIES))) @@ -230,7 +226,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(vndk_sameprocess_ $(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_PRIVATE_LIBRARIES := $(llndk_private_libraries) $(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(vndk_core_libraries) $(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(sanitizer_runtime_libraries) -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/ld.config.txt.in $(vndk_lib_dep) +$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/ld.config.txt.in @echo "Generate: $< -> $@" @mkdir -p $(dir $@) $(hide) sed -e 's?%LLNDK_LIBRARIES%?$(PRIVATE_LLNDK_LIBRARIES)?g' $< >$@ @@ -238,8 +234,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/ld.config.txt.in $(vndk_lib_dep) $(hide) sed -i -e 's?%VNDK_CORE_LIBRARIES%?$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $@ $(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $@ -vndk_lib_md5 := -vndk_lib_dep := llndk_libraries := vndk_sameprocess_libraries := vndk_core_libraries := @@ -266,13 +260,8 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(LOCAL_MODULE) include $(BUILD_SYSTEM)/base_rules.mk -llndk_md5 = $(word 1, $(shell echo $(LLNDK_LIBRARIES) | $(MD5SUM))) -llndk_dep = $(intermediates)/$(llndk_md5).dep -$(llndk_dep): - $(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.dep && touch $@ - $(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES) -$(LOCAL_BUILT_MODULE): $(llndk_dep) +$(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) $(hide) echo -n > $@ @@ -287,13 +276,8 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(LOCAL_MODULE) include $(BUILD_SYSTEM)/base_rules.mk -vndksp_md5 = $(word 1, $(shell echo $(LLNDK_LIBRARIES) | $(MD5SUM))) -vndksp_dep = $(intermediates)/$(vndksp_md5).dep -$(vndksp_dep): - $(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.dep && touch $@ - $(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES) -$(LOCAL_BUILT_MODULE): $(vndksp_dep) +$(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) $(hide) echo -n > $@ |