diff options
| -rw-r--r-- | core/main.mk | 17 | ||||
| -rw-r--r-- | envsetup.sh | 39 |
2 files changed, 33 insertions, 23 deletions
diff --git a/core/main.mk b/core/main.mk index fd6bdbc..94b55d4 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 diff --git a/envsetup.sh b/envsetup.sh index 4a8b558..cf6f76f 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -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 - if [ ! "$JAVA_HOME" ]; then - case `uname -s` in - Darwin) - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home - ;; - *) - export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun - ;; - esac +# 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.6/Home + ;; + *) + 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) |