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
This commit is contained in:
Colin Cross 2017-09-20 17:56:12 -07:00
parent d739bef96d
commit dcd6b243ac

View file

@ -33,6 +33,7 @@ $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
endif endif
ifdef LOCAL_SOONG_DEX_JAR 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))) $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))
java-dex : $(LOCAL_BUILT_MODULE) java-dex : $(LOCAL_BUILT_MODULE)
else else