From 54a71e229b8848144dfa382a704ee3213bc1acd0 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 18 Dec 2018 11:06:25 -0800 Subject: [PATCH] Add missing dependency on common javalib.jar Building $OUT/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar is no longer updating the common intermediates: out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar after I25163e91886cea6941afa25cdb529ed053278dcb. Add the missing dependency on common javalib.jar, which already depends on common classes.jar. Bug: 119412419 Bug: 121194944 Test: rm out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar && m core-tests && ls out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar Change-Id: Id463d159e46c82656c364fdb2dbe53f33ee1a103 --- core/soong_java_prebuilt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 7adee8896..26c215291 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -97,6 +97,7 @@ ifdef LOCAL_SOONG_DEX_JAR $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar))) $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) + $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar))) else # LOCAL_IS_HOST_MODULE $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE))) $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar) $(full_classes_header_jar)))