tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch the required host Java environment to 1.6.

Browse source 
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
This commit is contained in:
Jeff Hamilton 2010-06-21 18:26:38 -05:00
parent f319c635a8
commit 4a1c70e53b
2 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/main.mk
View file

@ -102,43 +102,38 @@ $(error Directory names containing spaces not supported)
endif
# The windows build server currently uses 1.6. This will be fixed.
ifneq ($(HOST_OS),windows)
# Check for the correct version of java
java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.5[\. "$$]')
java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]')
ifeq ($(strip $(java_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)
$(info of java.)
$(info $(space))
$(info Your version is: $(shell java -version 2>&1 | head -n 1).)
$(info The correct version is: 1.5.)
$(info The correct version is: 1.6.)
$(info $(space))
$(info Please follow the machine setup instructions at)
$(info $(space)$(space)$(space)$(space)http://source.android.com/download)
$(info ************************************************************)
#$(error stop)
$(error stop)
endif
# Check for the correct version of javac
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.5[\. "$$]')
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]')
ifeq ($(strip $(javac_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)
$(info of javac.)
$(info $(space))
$(info Your version is: $(shell javac -version 2>&1 | head -n 1).)
$(info The correct version is: 1.5.)
$(info The correct version is: 1.6.)
$(info $(space))
$(info Please follow the machine setup instructions at)
$(info $(space)$(space)$(space)$(space)http://source.android.com/download)
$(info ************************************************************)
#$(error stop)
$(error stop)
endif
endif # windows
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
> $(OUT_DIR)/versions_checked.mk)
endif

25
envsetup.sh
View file

@ -99,6 +99,9 @@ function setpaths()
if [ -n $ANDROID_BUILD_PATHS ] ; then
export PATH=${PATH/$ANDROID_BUILD_PATHS/}
fi
if [ -n $ANDROID_PRE_BUILD_PATHS ] ; then
export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/}
fi
# and in with the new
CODE_REVIEWS=
@ -109,6 +112,15 @@ function setpaths()
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS
export PATH=$PATH$ANDROID_BUILD_PATHS
unset ANDROID_JAVA_TOOLCHAIN
if [ -n "$JAVA_HOME" ]; then
export ANDROID_JAVA_TOOLCHAIN=$JAVA_HOME/bin
fi
export ANDROID_PRE_BUILD_PATHS=$ANDROID_JAVA_TOOLCHAIN
if [ -n "$ANDROID_PRE_BUILD_PATHS" ]; then
export PATH=$ANDROID_PRE_BUILD_PATHS:$PATH
fi
unset ANDROID_PRODUCT_OUT
export ANDROID_PRODUCT_OUT=$(get_abs_build_var PRODUCT_OUT)
export OUT=$ANDROID_PRODUCT_OUT
@ -134,6 +146,7 @@ function printconfig()
function set_stuff_for_environment()
{
settitle
set_java_home
setpaths
set_sequence_number
@ -1053,19 +1066,21 @@ function godir () {
cd $T/$pathname
}
# Force JAVA_HOME to point to java 1.5 if it isn't already set
if [ "$STAY_OFF_MY_LAWN" = "" ]; then
# Force JAVA_HOME to point to java 1.6 if it isn't already set
function set_java_home() {
if [ "$STAY_OFF_MY_LAWN" = "" ]; then
if [ ! "$JAVA_HOME" ]; then
case `uname -s` in
Darwin)
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
;;
*)
export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
export JAVA_HOME=/usr/lib/jvm/java-6-sun
;;
esac
fi
fi
fi
}
# determine whether arrays are zero-based (bash) or one-based (zsh)
_xarray=(a b c)