From 67845a0884372c26f8e9450ff0ceb70b6414eec1 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Thu, 23 Jan 2014 23:16:35 +0000 Subject: [PATCH] android: Stop adding toolchain dir to PATH. This seems mostly no longer necessary (at least I can build all targets in an open-source chrome/android build without problems). I'm guessing that https://codereview.chromium.org/9693042 made this obsolete. It was only needed for `as` with clang; pass -B to clang instead for now (until we switch to clang's integrated assembler). BUG=330631,124610 R=torne@chromium.org Review URL: https://codereview.chromium.org/133963003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@246714 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/envsetup_functions.sh | 3 --- common.gypi | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/android/envsetup_functions.sh b/android/envsetup_functions.sh index af241163d..b9502e8d0 100755 --- a/android/envsetup_functions.sh +++ b/android/envsetup_functions.sh @@ -68,9 +68,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION} # linker. export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold - # Must have tools like arm-linux-androideabi-gcc on the path for ninja - export PATH=$PATH:${ANDROID_TOOLCHAIN} - # Add Chromium Android development scripts to system path. # Must be after CHROME_SRC is set. export PATH=$PATH:${CHROME_SRC}/build/android diff --git a/common.gypi b/common.gypi index 835dda36a..90b08a7a4 100644 --- a/common.gypi +++ b/common.gypi @@ -3267,6 +3267,7 @@ 'cflags': [ # TODO(hans) Enable integrated-as (crbug.com/124610). '-no-integrated-as', + '-B<(android_toolchain)', # Else /usr/bin/as gets picked up. ], 'ldflags!': [