diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-09 07:17:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 07:17:15 +0000 |
| commit | 823cf7297aacee07f7beecda5f6a84842276d90f (patch) | |
| tree | a4c2b9f57e4b5b4b39b827c0975056adf1e3cf71 | |
| parent | e252975036dcbe46a32fd106566b6b05aaf5797a (diff) | |
| parent | b6f695193eb0bcc5dea70343c45983e95c57bdce (diff) | |
| download | build-temp_ab_7272582.tar.gz | |
Merge "Fix build break for Android.bp dex_import" am: b2fccdd318 am: b6f695193etemp_ab_7272582
Original change: https://android-review.googlesource.com/c/platform/build/+/1644082
Change-Id: I67a237d01d713e8af1cced27ad940a5ec20b3a2c
| -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 ca9b825058..0922defb7b 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -128,9 +128,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 @@ -161,8 +163,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 |