commit ed44a549911f2c2cfd6cd067685f59aad3652bf7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 23 02:49:39 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 23 02:49:40 2017 +0000
tree 2a5a0a1fd217cdae2d3d9ef09088acbb2f1efa3d
parent bfc4f5e339c5a56c741b6c4d45b94dd96c2e7f3b
parent 200951bdb72ea37244a307a58d7162f85a6586e7

Merge "Desugar when javac version is 1.7"

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 019b055..c4dd84b 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -455,7 +455,6 @@
 
 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 @@
 	$(desugar-classes-jar)
 endif
 endif
-endif
 
 ifndef my_desugaring
 full_classes_desugar_jar := $(full_classes_compiled_jar)