Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e723b49 authored by Ryan Prichard's avatar Ryan Prichard Committed by android-build-merger
Browse files

Merge "envsetup: avoid adding "::" (the cwd) to the PATH" am: 0f998368 am:...

Merge "envsetup: avoid adding "::" (the cwd) to the PATH" am: 0f998368 am: 9347391d am: ab0ed6e5
am: 549f9c07

Change-Id: I2573f62adccb1165efb1a487295a20c13c5bd556
parents 93f7d508 549f9c07
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -272,12 +272,12 @@ function setpaths()

    # Append asuite prebuilts path to ANDROID_BUILD_PATHS.
    local os_arch=$(get_build_var HOST_PREBUILT_TAG)
    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
    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 PATH=$ANDROID_BUILD_PATHS:$PATH
    export PATH=$ANDROID_BUILD_PATHS$PATH

    # out with the duplicate old
    if [ -n $ANDROID_PYTHONPATH ]; then