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

Commit f0971be1 authored by Alan Leung's avatar Alan Leung Committed by Gerrit Code Review
Browse files

Merge "Add zip2zip as dependency of dexing step."

parents 7f0e2219 5eb88c01

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ $(LOCAL_BUILT_MODULE) : $(full_classes_jar) 
else # !LOCAL_IS_STATIC_JAVA_LIBRARY

$(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)

$(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)

$(built_dex): $(full_classes_desugar_jar) $(DX)

$(built_dex): $(full_classes_desugar_jar) $(DX) $(ZIP2ZIP)

ifneq ($(USE_D8_DESUGAR),true)

	$(transform-classes.jar-to-dex)

else

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ endif # USE_R8 
endif # LOCAL_PROGUARD_ENABLED



ifndef my_r8

$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)

$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX) $(ZIP2ZIP)

ifneq ($(USE_D8_DESUGAR),true)

	$(transform-classes.jar-to-dex)

else