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

Commit 718de33e authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" 

am: 96257655

Change-Id: I7501eda6c5fcb2c6f495cff71f068c3ec4015413
parents 531fcc2e 96257655

core/definitions.mk

+8 −0
Original line number Diff line number Diff line
@@ -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

core/java.mk

+4 −0
Original line number Diff line number Diff line
@@ -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