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

Commit 8c75ca0d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix tests. Missing colon separator and typo" am: da308184 am: 6927cd75 

Original change: https://android-review.googlesource.com/c/platform/build/+/2329673



Change-Id: Id313a2d40b77d19671b45320b077ff6c70db5b2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54d69c62 6927cd75

envsetup.sh

+4 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ function set_lunch_paths() 
    export ANDROID_TARGET_OUT_TESTCASES=$(get_abs_build_var TARGET_OUT_TESTCASES)



    # Finally, set PATH

    export PATH=$ANDROID_LUNCH_BUILD_PATHS$PATH

    export PATH=$ANDROID_LUNCH_BUILD_PATHS:$PATH

}



# Add directories to PATH that are NOT dependent on the lunch target.
@@ -297,7 +297,8 @@ function set_global_paths() 


    # And in with the new...

    ANDROID_GLOBAL_BUILD_PATHS=$T/build/bazel/bin

    ANDRID_GLOBAL_BUILD_PATHS+=$T/development/scripts:$T/prebuilts/devtools/tools

    ANDROID_GLOBAL_BUILD_PATHS+=:$T/development/scripts

    ANDROID_GLOBAL_BUILD_PATHS+=:$T/prebuilts/devtools/tools



    # add kernel specific binaries

    if [ $(uname -s) = Linux ] ; then
@@ -324,7 +325,7 @@ function set_global_paths() 
    fi



    # Finally, set PATH

    export PATH=$ANDROID_GLOBAL_BUILD_PATHS$PATH

    export PATH=$ANDROID_GLOBAL_BUILD_PATHS:$PATH

}



function printconfig()