tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: ce9dfdeee6

Change-Id: I4cf83e8ea97a0ebdc8f25d569fd997a01a603a4d
This commit is contained in:
Colin Cross 2017-03-23 02:59:54 +00:00 committed by android-build-merger
commit 937d276bed
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

@ -455,7 +455,6 @@ javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
my_desugaring := my_desugaring :=
ifndef LOCAL_JACK_ENABLED ifndef LOCAL_JACK_ENABLED
ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.8)
ifndef LOCAL_IS_STATIC_JAVA_LIBRARY ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
my_desugaring := true my_desugaring := true
$(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) $(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
@ -463,7 +462,6 @@ $(full_classes_desugar_jar): $(full_classes_compiled_jar) $(DESUGAR)
$(desugar-classes-jar) $(desugar-classes-jar)
endif endif
endif endif
endif
ifndef my_desugaring ifndef my_desugaring
full_classes_desugar_jar := $(full_classes_compiled_jar) full_classes_desugar_jar := $(full_classes_compiled_jar)