StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true

Browse Source 
Proguard doesn't support v53 class files. For now, this
CL simply replaces the Proguard step with a plain 'cp',
which is essentially a no-op.

To avoid apps exceeding the dex limit in this mode, this
CL also enables --multi-dex for those builds.

Test: Treehugger
Bug: 67673860
Change-Id: I17dc5d827360d606a0cac12e324f97e8dedbb630
This commit is contained in:
Tobias Thierer
2017-10-25 02:38:01 +01:00
parent 0bbd8d9e37
commit 89740664a5
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/definitions.mk
View File

@@ -2777,6 +2777,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)' \
@@ -2784,6 +2790,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
core/java.mk
View File

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