tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true"

Browse source 
am: 96257655c5

Change-Id: I7501eda6c5fcb2c6f495cff71f068c3ec4015413
This commit is contained in:
Tobias Thierer 2017-11-02 12:42:54 +00:00 committed by android-build-merger
commit 718de33ef9
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

@ -2774,6 +2774,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)' \
@ -2781,6 +2787,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

@ -555,6 +555,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