Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f14179b3 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix some java library dependencies 

Bug: 130111713
Test: treehugger
Test: build system image w/RBE
Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d
parent b4416300

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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))

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 :=