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

Commit bfafdcba authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Check LEGACY_USE_JAVA7 before using 1.8." am: 239783a7 am: efe15f74 

am: d7e28fa2

* commit 'd7e28fa2':
  Check LEGACY_USE_JAVA7 before using 1.8.
parents f00cf839 d7e28fa2

core/java_common.mk

+5 −1
Original line number Diff line number Diff line
@@ -4,7 +4,11 @@ 
## Java version

###########################################################

ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))

  ifeq (,$(LEGACY_USE_JAVA7))

    LOCAL_JAVA_LANGUAGE_VERSION := 1.8

  else

    LOCAL_JAVA_LANGUAGE_VERSION := 1.7

  endif

endif

LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)