p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Desugar when javac version is 1.7" am: ed44a54991 am: ce9dfdeee6 

am: 937d276bed

Change-Id: I19430809cf5cf77fc4876d0ddee00bd4ddc4ff12
This commit is contained in:
Colin Cross 2017-03-23 03:02:54 +00:00 committed by android-build-merger
parent e272d9c64a 937d276bed
commit 7a43b1edc3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/java.mk
View File

@ -465,7 +465,6 @@ 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)
@ -473,7 +472,6 @@ $(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)