openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Revert "Merge "Switch the required host Java environment to 1.6." into kraken" 

This reverts commit 1f29d2c376, reversing
changes made to f9f513ab33.
This commit is contained in:
Ed Heyl 2010-06-11 15:22:42 -07:00
parent 1f29d2c376
commit d83f33969a
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/main.mk
View File

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

39
envsetup.sh
View File

@ -98,9 +98,6 @@ function setpaths()
if [ -n $ANDROID_BUILD_PATHS ] ; then if [ -n $ANDROID_BUILD_PATHS ] ; then
export PATH=${PATH/$ANDROID_BUILD_PATHS/} export PATH=${PATH/$ANDROID_BUILD_PATHS/}
fi fi
if [ -n $ANDROID_PRE_BUILD_PATHS ] ; then
export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/}
fi
# and in with the new # and in with the new
CODE_REVIEWS= CODE_REVIEWS=
@ -111,15 +108,6 @@ function setpaths()
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS 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 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 unset ANDROID_PRODUCT_OUT
export ANDROID_PRODUCT_OUT=$(get_abs_build_var PRODUCT_OUT) export ANDROID_PRODUCT_OUT=$(get_abs_build_var PRODUCT_OUT)
export OUT=$ANDROID_PRODUCT_OUT export OUT=$ANDROID_PRODUCT_OUT
@ -145,7 +133,6 @@ function printconfig()
function set_stuff_for_environment() function set_stuff_for_environment()
{ {
settitle settitle
set_java_home
setpaths setpaths
set_sequence_number set_sequence_number
@ -1039,21 +1026,19 @@ function godir () {
cd $T/$pathname cd $T/$pathname
} }
# Force JAVA_HOME to point to java 1.6 if it isn't already set # Force JAVA_HOME to point to java 1.5 if it isn't already set
function set_java_home() { if [ "$STAY_OFF_MY_LAWN" = "" ]; then
if [ "$STAY_OFF_MY_LAWN" = "" ]; then if [ ! "$JAVA_HOME" ]; then
if [ ! "$JAVA_HOME" ]; then case `uname -s` in
case `uname -s` in Darwin)
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
esac
fi
fi fi
} fi
# determine whether arrays are zero-based (bash) or one-based (zsh) # determine whether arrays are zero-based (bash) or one-based (zsh)
_xarray=(a b c) _xarray=(a b c)