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

Commit 7147b52c authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Add LLVM binutils prebuilds in PATH"

parents c9fc1120 dfd00b1b

core/dumpvar.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ endif 
ANDROID_BUILD_PATHS := $(ABP)

ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG)

ANDROID_CLANG_PREBUILTS := prebuilts/clang/host/$(HOST_PREBUILT_TAG)



# Dump mulitple variables to "<var>=<value>" pairs, one per line.

# The output may be executed as bash script.

envsetup.sh

+8 −5
Original line number Diff line number Diff line
@@ -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