From 6d0ca1f6cca566fe97c788fa07be92308770a776 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 29 Nov 2017 20:44:11 -0800 Subject: [PATCH] Copy soong java prebuilts to classes-pre-proguard.jar Some robolectric rules assume that classes-pre-proguard.jar exists. Soong doesn't support proguard yet, so copy classes.jar to classes-pre-proguard.jar for now. Bug: 69917341 Test: m checkbuild tests Change-Id: I818363ec13c2e5e1c4ab5bd6389ea4687de953eb --- core/soong_java_prebuilt.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index ccbe745d0a..6c27f57413 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -16,10 +16,12 @@ include $(BUILD_SYSTEM)/base_rules.mk ####################################### full_classes_jar := $(intermediates.COMMON)/classes.jar +full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar common_javalib.jar := $(intermediates.COMMON)/javalib.jar $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_jar))) +$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_proguard_jar))) ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\