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

Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1 am: 235e342639

Browse Source 
am: 916de9606b

Change-Id: I824c89dc8f10912c60313023e5e1eecd610f36e3
This commit is contained in:
Colin Cross
2017-03-21 19:44:13 +00:00
committed by android-build-merger
parent a471822a57 916de9606b
commit 09e82eb89a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java.mk
View File

@@ -466,12 +466,14 @@ javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
my_desugaring :=
ifndef LOCAL_JACK_ENABLED
ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.8)
ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
my_desugaring := true
$(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
$(full_classes_desugar_jar): $(full_classes_compiled_jar) $(DESUGAR)
$(desugar-classes-jar)
endif
endif
endif
ifndef my_desugaring
full_classes_desugar_jar := $(full_classes_compiled_jar)