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

Source vendorsetup.sh scripts anywhere within the repo.

Browse Source 
When sourcing the envsetup.sh script from a deep directory
inside of the repo, the vendorsetup.sh scripts are not being
sourced. This was causing the ANDROID_ENABLE_METRICS_UPLOAD
not to be set and developer's metrics were not being uploaded.
Provided the top directory to each directory path. Also cleaned
up the function to handle whitespacing correctly.

Bug: b/169699936
Test: *Ran source ../../build/envsetup.sh from external/libchrome dir
      *Renamed repo dir to "aosp master" and source build/envsetup.sh
      *Ran the script in zsh command line interpretor
      *Ran the script in MacOS
Change-Id: I96eb73d50a1923cdda782792778b0d185a341cf9
This commit is contained in:
Patrice Arruda
2020-10-12 21:29:14 +00:00
parent 870ff764a6
commit aa4b824d25
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
envsetup.sh
View File

@@ -822,7 +822,7 @@ function gettop
local TOPFILE=build/make/core/envsetup.mk local TOPFILE=build/make/core/envsetup.mk
if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then
# The following circumlocution ensures we remove symlinks from TOP. # The following circumlocution ensures we remove symlinks from TOP.
(cd $TOP; PWD= /bin/pwd) (cd "$TOP"; PWD= /bin/pwd)
else else
if [ -f $TOPFILE ] ; then if [ -f $TOPFILE ] ; then
# The following circumlocution (repeated below as well) ensures # The following circumlocution (repeated below as well) ensures
@@ -832,13 +832,13 @@ function gettop
else else
local HERE=$PWD local HERE=$PWD
local T= local T=
while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do while [ \( ! \( -f $TOPFILE \) \) -a \( "$PWD" != "/" \) ]; do
\cd .. \cd ..
T=`PWD= /bin/pwd -P` T=`PWD= /bin/pwd -P`
done done
\cd $HERE \cd "$HERE"
if [ -f "$T/$TOPFILE" ]; then if [ -f "$T/$TOPFILE" ]; then
echo $T echo "$T"
fi fi
fi fi
fi fi
@@ -1653,25 +1653,26 @@ function validate_current_shell() {
# This allows loading only approved vendorsetup.sh files # This allows loading only approved vendorsetup.sh files
function source_vendorsetup() { function source_vendorsetup() {
unset VENDOR_PYTHONPATH unset VENDOR_PYTHONPATH
local T="$(gettop)"
allowed= allowed=
for f in $(find -L device vendor product -maxdepth 4 -name 'allowed-vendorsetup_sh-files' 2>/dev/null | sort); do for f in $(cd "$T" && find -L device vendor product -maxdepth 4 -name 'allowed-vendorsetup_sh-files' 2>/dev/null | sort); do
if [ -n "$allowed" ]; then if [ -n "$allowed" ]; then
echo "More than one 'allowed_vendorsetup_sh-files' file found, not including any vendorsetup.sh files:" echo "More than one 'allowed_vendorsetup_sh-files' file found, not including any vendorsetup.sh files:"
echo " $allowed" echo " $allowed"
echo " $f" echo " $f"
return return
fi fi
allowed="$f" allowed="$T/$f"
done done
allowed_files= allowed_files=
[ -n "$allowed" ] && allowed_files=$(cat "$allowed") [ -n "$allowed" ] && allowed_files=$(cat "$allowed")
for dir in device vendor product; do for dir in device vendor product; do
for f in $(test -d $dir && \ for f in $(cd "$T" && test -d $dir && \
find -L $dir -maxdepth 4 -name 'vendorsetup.sh' 2>/dev/null | sort); do find -L $dir -maxdepth 4 -name 'vendorsetup.sh' 2>/dev/null | sort); do
if [[ -z "$allowed" || "$allowed_files" =~ $f ]]; then if [[ -z "$allowed" || "$allowed_files" =~ $f ]]; then
echo "including $f"; . "$f" echo "including $f"; . "$T/$f"
else else
echo "ignoring $f, not in $allowed" echo "ignoring $f, not in $allowed"
fi fi