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

Commit cb9847c8 authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Reject Google\'s build of JDK." 

am: 98f7a5c7

* commit '98f7a5c7':
  Reject Google's build of JDK.

Change-Id: Ie818a54ea90d960e4b570b96c006e51e32d8b76f
parents 93a34234 98f7a5c7

core/main.mk

+11 −0
Original line number Diff line number Diff line
@@ -232,6 +232,12 @@ $(error stop) 
endif # java version is not Sun Oracle JDK

endif # if requires_openjdk



KNOWN_INCOMPATIBLE_JAVAC_VERSIONS := google

incompat_javac := $(foreach v,$(KNOWN_INCOMPATIBLE_JAVAC_VERSIONS),$(findstring $(v),$(javac_version_str)))

ifneq ($(incompat_javac),)

javac_version :=

endif



# Check for the correct version of javac

ifeq ($(strip $(javac_version)),)

$(info ************************************************************)
@@ -239,7 +245,12 @@ $(info You are attempting to build with the incorrect version) 
$(info of javac.)

$(info $(space))

$(info Your version is: $(javac_version_str).)

ifneq ($(incompat_javac),)

$(info This '$(incompat_javac)' version is not supported for Android platform builds.)

$(info Use a publicly available JDK and make sure you have run envsetup.sh / lunch.)

else

$(info The required version is: $(required_javac_version))

endif

$(info $(space))

$(info Please follow the machine setup instructions at)

$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html)