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

Commit 5a64925a authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Drop build support for LEGACY_USE_JAVA7." am: 53681310 am: 28be9906 

am: 7d8194be

Change-Id: I9c5d261b7c9c0f652c733ebc89c44d1295986cf8
parents 4a05738a 7d8194be

core/droiddoc.mk

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) 
                \@$(PRIVATE_SRC_LIST_FILE) \

                -J-Xmx1024m \

                -XDignore.symbol.file \

                $(if $(LEGACY_USE_JAVA7),,-Xdoclint:none) \

                -Xdoclint:none \

                $(PRIVATE_PROFILING_OPTIONS) \

                $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \

                $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \

core/java_common.mk

+1 −6
Original line number Diff line number Diff line
@@ -19,12 +19,7 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
  ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_18_support)))

    LOCAL_JAVA_LANGUAGE_VERSION := 1.7

  else

    # This retains 1.7 for ART build bots only. http://b/27583810

    ifeq (,$(LEGACY_USE_JAVA7))

    LOCAL_JAVA_LANGUAGE_VERSION := 1.8

    else

      LOCAL_JAVA_LANGUAGE_VERSION := 1.7

    endif

  endif

endif

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