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

@@ -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

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!': [