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

Commit 349b4011 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 am: 718de33e 

am: f79c5c07

Change-Id: I7c74755ba9c7e8a852f19386e1a9a3c93089aa55
parents 402b4f36 f79c5c07

core/definitions.mk

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

core/java.mk

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