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

Commit 54a71e22 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 7cac3adf

core/soong_java_prebuilt.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)))