p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Reject Google\'s build of JDK." am: 98f7a5c am: cb9847c 

am: 55fb352

* commit '55fb35281e41e022e165ec2f65027742436060f4':
  Reject Google's build of JDK.

Change-Id: I06bfd6b5df10bb3c514f63b0cd0b413928ea5124
This commit is contained in:
Ying Wang 2016-04-14 19:21:36 +00:00 committed by android-build-merger
parent a313c1a266 55fb35281e
commit eb7e9b1d53
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/main.mk
View File

@ -234,6 +234,12 @@ $(error stop)
endif # java version is not Sun Oracle JDK endif # java version is not Sun Oracle JDK
endif # if requires_openjdk 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 # Check for the correct version of javac
ifeq ($(strip $(javac_version)),) ifeq ($(strip $(javac_version)),)
$(info ************************************************************) $(info ************************************************************)
@ -241,7 +247,12 @@ $(info You are attempting to build with the incorrect version)
$(info of javac.) $(info of javac.)
$(info $(space)) $(info $(space))
$(info Your version is: $(javac_version_str).) $(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)) $(info The required version is: $(required_javac_version))
endif
$(info $(space)) $(info $(space))
$(info Please follow the machine setup instructions at) $(info Please follow the machine setup instructions at)
$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html)