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

Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" am: 96257655c5 

am: 718de33ef9

Change-Id: Ia162ffb7c8415e5573bc68c0c1fbc028e9ac8cdb
This commit is contained in:
Tobias Thierer 2017-11-02 12:46:18 +00:00 committed by android-build-merger
parent a90593f32c 718de33ef9
commit f79c5c07a1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/definitions.mk
View File

@ -2783,6 +2783,12 @@ endef
###########################################################
## Commands to call Proguard
###########################################################
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),true)
define transform-jar-to-proguard
@echo Skipping Proguard: $<$(PRIVATE_PROGUARD_INJAR_FILTERS) $@
$(hide) cp '$<' $@
endef
else
define transform-jar-to-proguard
@echo Proguard: $@
$(hide) $(PROGUARD) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \
@ -2790,6 +2796,8 @@ $(hide) $(PROGUARD) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \
$(PRIVATE_PROGUARD_FLAGS) \
$(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR))
endef
endif
###########################################################
## Commands to call R8

4
core/java.mk
View File

@ -568,6 +568,10 @@ endif
$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),true)
LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
endif
my_desugaring :=
ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
my_desugaring := true