diff options
| -rw-r--r-- | core/soong_java_prebuilt.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index c60017834e..c4e8a61173 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -120,9 +120,11 @@ ifdef LOCAL_SOONG_DEX_JAR $(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))) - ifneq ($(TURBINE_ENABLED),false) - $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar))) + ifdef LOCAL_SOONG_CLASSES_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 endif @@ -153,8 +155,10 @@ ifdef LOCAL_SOONG_DEXPREOPT_CONFIG $(eval $(call copy-one-file,$(LOCAL_SOONG_DEXPREOPT_CONFIG), $(call local-intermediates-dir,)/dexpreopt.config)) endif +ifdef LOCAL_SOONG_CLASSES_JAR javac-check : $(full_classes_jar) javac-check-$(LOCAL_MODULE) : $(full_classes_jar) +endif .PHONY: javac-check-$(LOCAL_MODULE) ifndef LOCAL_IS_HOST_MODULE |