Merge "Desugar when javac version is 1.7" am: ed44a54991 am: ce9dfdeee6 (7a43b1ed) · Commits · e / os / android_build

core/java.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)