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

Commit 200951bd authored by Colin Cross's avatar Colin Cross
Browse files

Desugar when javac version is 1.7 

Modules compiled with javac 1.7 may have LOCAL_STATIC_JAVA_LIBRARIES
pointing to jars that contain code compiled with javac 1.8, and may
need desugaring.

Test: m -j ANDROID_COMPILE_WITH_JACK=false checkbuild
Change-Id: I470fc0a2fba51179a3ef95986cb3030194cd8f1c
parent 2c280271

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)