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

am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME. 

Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
  The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This commit is contained in:
Joe Onorato 2010-06-23 16:04:38 -07:00 committed by Android Git Automerger
parent ba3897fdf1 1884d99a7a
commit 74ba0c834f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildspec.mk.default
View File

@ -115,4 +115,4 @@ endif
# variable will be changed. After you have modified this file with the new
# changes (see buildspec.mk.default), update this to the new value from
# buildspec.mk.default.
BUILD_ENV_SEQUENCE_NUMBER := 9
BUILD_ENV_SEQUENCE_NUMBER := 10

2
core/envsetup.mk
View File

@ -16,7 +16,7 @@ include $(BUILD_SYSTEM)/version_defaults.mk
# people who haven't re-run those will have to do so before they
# can build. Make sure to also update the corresponding value in
# buildspec.mk.default and envsetup.sh.
CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 9
CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 10
# ---------------------------------------------------------------
# The product defaults to generic on hardware and sim on sim

2
envsetup.sh
View File

@ -158,7 +158,7 @@ function set_stuff_for_environment()
function set_sequence_number()
{
export BUILD_ENV_SEQUENCE_NUMBER=9
export BUILD_ENV_SEQUENCE_NUMBER=10
}
function settitle()