Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" am: 96257655c5 am: 718de33ef9 (349b4011) · Commits · e / os / android_build

core/definitions.mk

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2783,6 +2783,12 @@ endef
	###########################################################		###########################################################
	## Commands to call Proguard		## 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		define transform-jar-to-proguard
	@echo Proguard: $@		@echo Proguard: $@
	$(hide) $(PROGUARD) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \		$(hide) $(PROGUARD) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \
	@@ -2790,6 +2796,8 @@ $(hide) $(PROGUARD) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \
	$(PRIVATE_PROGUARD_FLAGS) \		$(PRIVATE_PROGUARD_FLAGS) \
	$(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR))		$(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR))
	endef		endef
			endif


	###########################################################		###########################################################
	## Commands to call R8		## Commands to call R8

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -568,6 +568,10 @@ endif

	$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))		$(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 :=		my_desugaring :=
	ifndef LOCAL_IS_STATIC_JAVA_LIBRARY		ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
	my_desugaring := true		my_desugaring := true