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

Commit a7b85086 authored by Ben Cheng's avatar Ben Cheng Committed by Gerrit Code Review
Browse files

Merge "Export TARGET_GCC_VERSION as an env variable."

parents f8b804f8 15266706

envsetup.sh

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ function setpaths() 


    # defined in core/config.mk

    targetgccversion=$(get_build_var TARGET_GCC_VERSION)

    export TARGET_GCC_VERSION=$targetgccversion



    # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.

    export ANDROID_EABI_TOOLCHAIN=

tools/adbs

+4 −2
Original line number Diff line number Diff line
@@ -140,13 +140,15 @@ def SetupToolsPath(): 
    uname = "darwin-x86"

  elif uname == "Linux":

    uname = "linux-x86"

  prefix = "./prebuilts/gcc/" + uname + "/arm/arm-linux-androideabi-4.6/bin/"

  gcc_version = os.environ["TARGET_GCC_VERSION"]

  prefix = "./prebuilts/gcc/" + uname + "/arm/arm-linux-androideabi-" + \

           gcc_version + "/bin/"

  addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"



  if (not os.path.exists(addr2line_cmd)):

    try:

      prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilts/gcc/" + \

               uname + "/arm/arm-linux-androideabi-4.6/bin/"

               uname + "/arm/arm-linux-androideabi-" + gcc_version + "/bin/"

    except:

      prefix = "";