commit 8bef6515daf1df01eddf50dc937930317f1dc4ea
author Colin Cross <ccross@android.com> Fri Oct 20 23:02:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 20 23:02:36 2017 +0000
tree 69b127b376254b6c4e8920181aacc79f35b127e8
parent 3c8949e342cb18fa7aeab8d43737d985ff491d09
parent 460205568fe25f61be07f411f5ad85a0691caa4a

Merge "Add dependencies on classes.jar for soong modules"

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index b251d7c..53ad50d 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -37,6 +37,7 @@
 ifdef LOCAL_SOONG_DEX_JAR
   ifndef LOCAL_IS_HOST_MODULE
     $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
+    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))
 
     # defines built_odex along with rule to install odex
     include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
@@ -62,6 +63,7 @@
     endif # LOCAL_DEX_PREOPT
   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)))
   endif
 
   java-dex : $(LOCAL_BUILT_MODULE)