StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24' into gingerbread-plus-aosp

* commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24':
  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:02:49 -07:00
committed by Android Git Automerger
parent 66d41149d9 aee4daacc8
commit 1884d99a7a
3 changed files with 3 additions and 3 deletions
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 # 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 # changes (see buildspec.mk.default), update this to the new value from
# buildspec.mk.default. # 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 # 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 # can build. Make sure to also update the corresponding value in
# buildspec.mk.default and envsetup.sh. # 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 # 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() function set_sequence_number()
{ {
export BUILD_ENV_SEQUENCE_NUMBER=9 export BUILD_ENV_SEQUENCE_NUMBER=10
} }
function settitle() function settitle()