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

Merge "Add banner announcing adevice when running builds." into main am: 8ac6cd19c5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2907196

Change-Id: I821ac87a4ca583e3c7133085e834d1469f975b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kevin Dagostino
2024-01-19 19:58:41 +00:00
committed by Automerger Merge Worker
parent 89c0a7feea 8ac6cd19c5
commit 65e0c618e0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
envsetup.sh
View File

@@ -254,7 +254,7 @@ function set_lunch_paths()
# Note: on windows/cygwin, ANDROID_LUNCH_BUILD_PATHS will contain spaces # Note: on windows/cygwin, ANDROID_LUNCH_BUILD_PATHS will contain spaces
# due to "C:\Program Files" being in the path. # 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. # TODO: Remove this after we think everyone has lunched again.
if [ -z "$ANDROID_LUNCH_BUILD_PATHS" -a -n "$ANDROID_BUILD_PATHS" ] ; then if [ -z "$ANDROID_LUNCH_BUILD_PATHS" -a -n "$ANDROID_BUILD_PATHS" ] ; then
ANDROID_LUNCH_BUILD_PATHS="$ANDROID_BUILD_PATHS" ANDROID_LUNCH_BUILD_PATHS="$ANDROID_BUILD_PATHS"
@@ -1886,6 +1886,11 @@ function _trigger_build()
>&2 echo "Couldn't locate the top of the tree. Try setting TOP." >&2 echo "Couldn't locate the top of the tree. Try setting TOP."
return 1 return 1
fi 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() function m()