Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74857ccc authored by Jiyong Park's avatar Jiyong Park Committed by Jae Shin
Browse files

Remove *.dep files for ld.config.txt, [llndk|vndksp].libraries.txt 

The dep files are not required because change in the command line
triggers the rule.

Test: m -j ld.config.txt llndk.libraries.txt vndksp.libraries.txt
Re-run the build after adding or removing libs to/from the vndk set.
The txt files are updated accordingly.

Merged-In: I9c9e22088cc2afeb66e8b159f611b25d698cf800
Change-Id: I9c9e22088cc2afeb66e8b159f611b25d698cf800
(cherry picked from commit 81088bf1)
parent a7e2a12d

rootdir/Android.mk

+3 −19
Original line number Original line Diff line number Diff line
@@ -206,10 +206,6 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

include $(BUILD_SYSTEM)/base_rules.mk

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)))

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_LLNDK_PRIVATE_LIBRARIES := $(llndk_private_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(vndk_core_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(vndk_core_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(sanitizer_runtime_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: $< -> $@"

	@echo "Generate: $< -> $@"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $@)

	$(hide) sed -e 's?%LLNDK_LIBRARIES%?$(PRIVATE_LLNDK_LIBRARIES)?g' $< >$@

	$(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?%VNDK_CORE_LIBRARIES%?$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $@

	$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $@

	$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $@





vndk_lib_md5 :=

vndk_lib_dep :=

llndk_libraries :=

llndk_libraries :=

vndk_sameprocess_libraries :=

vndk_sameprocess_libraries :=

vndk_core_libraries :=

vndk_core_libraries :=
@@ -266,13 +260,8 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

include $(BUILD_SYSTEM)/base_rules.mk

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): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES)

$(LOCAL_BUILT_MODULE): $(llndk_dep)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

	$(hide) echo -n > $@
@@ -287,13 +276,8 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

include $(BUILD_SYSTEM)/base_rules.mk

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): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES)

$(LOCAL_BUILT_MODULE): $(vndksp_dep)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

	$(hide) echo -n > $@