commit e8f1a420bcc83e69b9ce6e51cfb3ec0c4b2007c5
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 21 21:55:14 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 21 21:55:14 2019 +0000
tree 5e956d872dcc4430fa4b8eb0a2ca3951775f5438
parent 4ac781075570bdf97dca402f81f700a3c3310f9c
parent b405fe3765595969e5f8250b9b39fadfa74ad4fa

Merge "Don't depend on classes-header.jar when turbine is disabled"

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index ad1bfce..66410e1 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -95,7 +95,10 @@
 
     $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
     $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
-    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))
+    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar)))
+    ifneq ($(TURBINE_ENABLED),false)
+      $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar)))
+    endif
   endif
 
   java-dex : $(LOCAL_BUILT_MODULE)