Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" am: 96257655c5

am: 718de33ef9

Change-Id: Ia162ffb7c8415e5573bc68c0c1fbc028e9ac8cdb
This commit is contained in:
Tobias Thierer
2017-11-02 12:46:18 +00:00
committed by android-build-merger
2 changed files with 12 additions and 0 deletions

View File

@@ -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