openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add zip2zip as dependency of dexing step." am: f0971be1b6 am: 7269770b28 

am: af233a4dcf

Change-Id: If15cb28fa50d8f9398f300ee7b5df92fe2649210
This commit is contained in:
Alan Leung 2017-12-21 18:35:41 +00:00 committed by android-build-merger
parent a294e32960 af233a4dcf
commit d43b45b994
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_dalvik_java_library.mk
View File

@ -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

2
core/java.mk
View File

@ -783,7 +783,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