From f14179b3ff0e23091d217c5669015c84778cc3e2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 21:18:31 +0000 Subject: [PATCH] Fix some java library dependencies Bug: 130111713 Test: treehugger Test: build system image w/RBE Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d --- core/java.mk | 2 +- core/java_library.mk | 2 +- core/package_internal.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java.mk b/core/java.mk index 449da113a7..b463037fbc 100644 --- a/core/java.mk +++ b/core/java.mk @@ -409,7 +409,7 @@ legacy_proguard_flags := $(addprefix -libraryjars ,$(my_proguard_sdk_raise) \ $(full_shared_java_header_libs))) legacy_proguard_lib_deps := $(my_proguard_sdk_raise) \ - $(filter-out $(my_proguard_sdk_raise),$(full_shared_java_header_libs)) + $(filter-out $(my_proguard_sdk_raise),$(full_java_bootclasspath_libs) $(full_shared_java_header_libs)) legacy_proguard_flags += -printmapping $(proguard_dictionary) legacy_proguard_flags += -printconfiguration $(proguard_configuration) diff --git a/core/java_library.mk b/core/java_library.mk index c706cea724..34e487449e 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -68,7 +68,7 @@ else # !LOCAL_IS_STATIC_JAVA_LIBRARY $(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex) $(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) $(common_javalib.jar): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP) -$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN) +$(common_javalib.jar) : $(full_classes_pre_proguard_jar) $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN) @echo "target Jar: $(PRIVATE_MODULE) ($@)" rm -rf $@.parts && mkdir -p $@.parts $(call create-dex-jar,$@.parts/dex.zip,$(PRIVATE_DEX_FILE)) diff --git a/core/package_internal.mk b/core/package_internal.mk index 6b1cab49eb..d693c585bf 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -428,7 +428,7 @@ ifneq ($(full_classes_jar),) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) # Use the jarjar processed arhive as the initial package file. $(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) -$(LOCAL_BUILT_MODULE): $(built_dex) +$(LOCAL_BUILT_MODULE): $(built_dex) $(full_classes_pre_proguard_jar) else $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE :=