From dcd6b243acf9a7f8d6c2246178ef145d163a5255 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 20 Sep 2017 17:56:12 -0700 Subject: [PATCH] Add missing copy back to soong_java_prebuilt.mk javalib.jar needs to be copied to both $(intermediates.COMMON) and $(intermediates). Test: m -j checkbuild Change-Id: Ic2944691dced35c1e74d12f9948904cf748fe402 --- core/soong_java_prebuilt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index a69616648..ce09eb1e3 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -33,6 +33,7 @@ $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar))) endif ifdef LOCAL_SOONG_DEX_JAR +$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar))) $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE))) java-dex : $(LOCAL_BUILT_MODULE) else