From 0fbfb4bd571847629c9c42e37571171321e6d38b Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Mon, 22 Jul 2019 15:31:55 +0900 Subject: [PATCH] fix: set built_module in misc_prebuilt_internal.mk *_prebuilt_internal.mk should set "built_module" with LOCAL_BUILT_MODULE on success, since it is used to set dependency between built module and additional dependencies (LOCAL_ADDITIONAL_DEPENDENCIES). In aosp/970424, it didn't set it properly. As a consequence, setting additional dependencies to a built module was wrong for various classes of modules(ETC, SCRIPT, DATA) For example, prebuilt_etc_xml module(com.google.vr.platform.xml) has an additional depdendency(timestamp of xmllint). But the dependency is set to unexected module(com.android.support.apexer.soong_zip). This is because that 1) built_module is not set in misc_prebuilt_internal.mk 2) built_module is not reset after use and soong_zip was last module which set built_module variable. Bug: 132925121 Test: m com.google.vr.platform.xml && check build-.ninja to see if there is additional dependency as described above Change-Id: I74fdf6b6ad583f3c08dc0b8fc8595d7ef9cc7306 --- core/misc_prebuilt_internal.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/misc_prebuilt_internal.mk b/core/misc_prebuilt_internal.mk index cdd5cd5ae4..cc2683c5a7 100644 --- a/core/misc_prebuilt_internal.mk +++ b/core/misc_prebuilt_internal.mk @@ -27,3 +27,5 @@ include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file) $(transform-prebuilt-to-target) + +built_module := $(LOCAL_BUILT_MODULE) \ No newline at end of file