diff options
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/envsetup.sh b/envsetup.sh index 9e381a23e3..2fa566075a 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -22,7 +22,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y - jgrep: Greps on all local Java files. - resgrep: Greps on all local res/*.xml files. - mangrep: Greps on all local AndroidManifest.xml files. -- mgrep: Greps on all local Makefiles files. +- mgrep: Greps on all local Makefiles and *.bp files. - sepgrep: Greps on all local sepolicy files. - sgrep: Greps on all local source files. - godir: Go to the directory containing a file. @@ -246,8 +246,11 @@ function setpaths() if [ -n "$ANDROID_TOOLCHAIN_2ND_ARCH" ]; then ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_TOOLCHAIN_2ND_ARCH fi - ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_DEV_SCRIPTS: - export ANDROID_BUILD_PATHS + ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_DEV_SCRIPTS + + # Append llvm binutils prebuilts path to ANDROID_BUILD_PATHS. + local ANDROID_LLVM_BINUTILS=$(get_abs_build_var ANDROID_CLANG_PREBUILTS)/llvm-binutils-stable + ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_LLVM_BINUTILS # If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH # to ensure that the corresponding 'emulator' binaries are used. @@ -263,7 +266,7 @@ function setpaths() ;; esac if [ -n "$ANDROID_EMULATOR_PREBUILTS" -a -d "$ANDROID_EMULATOR_PREBUILTS" ]; then - ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS$ANDROID_EMULATOR_PREBUILTS: + ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ANDROID_EMULATOR_PREBUILTS export ANDROID_EMULATOR_PREBUILTS fi @@ -272,9 +275,9 @@ function setpaths() local ACLOUD_PATH="$T/prebuilts/asuite/acloud/$os_arch:" local AIDEGEN_PATH="$T/prebuilts/asuite/aidegen/$os_arch:" local ATEST_PATH="$T/prebuilts/asuite/atest/$os_arch:" - export ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS$ACLOUD_PATH$AIDEGEN_PATH$ATEST_PATH + export ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS:$ACLOUD_PATH$AIDEGEN_PATH$ATEST_PATH - export PATH=$ANDROID_BUILD_PATHS$PATH + export PATH=$ANDROID_BUILD_PATHS:$PATH # out with the duplicate old if [ -n $ANDROID_PYTHONPATH ]; then |