Merge "Add missing dependency on common javalib.jar" am: 81e29e0969

am: 61311e0ce1

Change-Id: Ie310220c761f4a19f35ff610a5d96dd5bd30724d
This commit is contained in:
Colin Cross 2018-12-18 13:38:18 -08:00 committed by android-build-merger
commit 33bf2a06ce

View file

@ -99,6 +99,7 @@ ifdef LOCAL_SOONG_DEX_JAR
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
else # LOCAL_IS_HOST_MODULE
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar) $(full_classes_header_jar)))