diff options
| author | George Zacharia <george.zcharia@gmail.com> | 2024-07-04 22:46:58 +0530 |
|---|---|---|
| committer | George Zacharia <george.zcharia@gmail.com> | 2024-07-04 22:46:58 +0530 |
| commit | f9518e5bdd657175397e6dbfcaba779742b7548c (patch) | |
| tree | 25a0b0ed2e52487b1f5e7a0bd8e454f259832ca1 /envsetup.sh | |
| parent | 027be4a4c3dd98792f7abebce8121869432147a4 (diff) | |
| parent | d15aa6b435081d5de094a2cb45e413a09bba75d4 (diff) | |
Merge tag 'android-14.0.0_r50' of https://android.googlesource.com/platform/build into u14.0
Android 14.0.0 Release 50 (AP2A.240605.024)
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/envsetup.sh b/envsetup.sh index 5786353c2e..e8f21aa0a1 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -62,7 +62,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y invocations of 'm' etc. - tapas: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] Sets up the build environment for building unbundled apps (APKs). -- banchan: banchan <module1> [<module2> ...] \ +- banchan: banchan <module1> [<module2> ...] \\ [arm|x86|arm64|riscv64|x86_64|arm64_only|x86_64only] [eng|userdebug|user] Sets up the build environment for building unbundled modules (APEXes). - croot: Changes directory to the top of the tree, or a subdirectory thereof. @@ -267,7 +267,7 @@ function set_lunch_paths() # Note: on windows/cygwin, ANDROID_LUNCH_BUILD_PATHS will contain spaces # due to "C:\Program Files" being in the path. - # Handle compat with the old ANDROID_BUILD_PATHS variable. + # Handle compat with the old ANDROID_BUILD_PATHS variable. # TODO: Remove this after we think everyone has lunched again. if [ -z "$ANDROID_LUNCH_BUILD_PATHS" -a -n "$ANDROID_BUILD_PATHS" ] ; then ANDROID_LUNCH_BUILD_PATHS="$ANDROID_BUILD_PATHS" @@ -379,7 +379,8 @@ function set_global_paths() fi # And in with the new... - ANDROID_GLOBAL_BUILD_PATHS=$T/build/bazel/bin + ANDROID_GLOBAL_BUILD_PATHS=$T/build/soong/bin + ANDROID_GLOBAL_BUILD_PATHS+=:$T/build/bazel/bin ANDROID_GLOBAL_BUILD_PATHS+=:$T/development/scripts ANDROID_GLOBAL_BUILD_PATHS+=:$T/prebuilts/devtools/tools @@ -786,7 +787,7 @@ function lunch() answer=$1 else print_lunch_menu - echo "Which would you like? [aosp_arm-trunk_staging-eng]" + echo "Which would you like? [aosp_cf_x86_64_phone-trunk_staging-eng]" echo -n "Pick from common choices above (e.g. 13) or specify your own (e.g. aosp_barbet-trunk_staging-eng): " read answer used_lunch_menu=1 @@ -796,10 +797,10 @@ function lunch() if [ -z "$answer" ] then - selection=aosp_arm-trunk_staging-eng + selection=aosp_cf_x86_64_phone-trunk_staging-eng elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$") then - local choices=($(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES)) + local choices=($(TARGET_BUILD_APPS= TARGET_PRODUCT= TARGET_RELEASE= TARGET_BUILD_VARIANT= get_build_var COMMON_LUNCH_CHOICES 2>/dev/null)) if [ $answer -le ${#choices[@]} ] then # array in zsh starts from 1 instead of 0. @@ -1925,6 +1926,11 @@ function _trigger_build() >&2 echo "Couldn't locate the top of the tree. Try setting TOP." return 1 fi + local ret=$? + if [[ ret -eq 0 && -z "${ANDROID_QUIET_BUILD:-}" && -n "${ANDROID_BUILD_BANNER}" ]]; then + echo "${ANDROID_BUILD_BANNER}" + fi + return $ret ) function m() |