Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed44a549 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Desugar when javac version is 1.7"

parents bfc4f5e3 200951bd

core/java.mk

+0 −2
Original line number Diff line number Diff line
@@ -455,7 +455,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)
@@ -463,7 +462,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)