Pull GN @ 252040, update calls

build/config/android/config.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains common system config stuff for the Android build.
 
-# TODO(brettw) bug 341772 put this into the is_android block when the toolchain
-# stuff is fixed in the GYP generator. The problem is that when we redo the
-# build in host mode, the OS is not android and the declarations are never
-# seen, which throws an error because these arguments are specified.
-declare_args() {
-  android_src = ""
+if (is_android) {
+  declare_args() {
+    # Absolute directory containing the Android source code.
+    android_src = ""
 
-  # This is set when building the Android WebView inside the Android build
-  # system, using the 'android' gyp backend. The WebView code is still built
-  # when this is unset, but builds using the normal chromium build system.
-  is_android_webview_build = false
-}
+    # This is set when building the Android WebView inside the Android build
+    # system, using the 'android' gyp backend. The WebView code is still built
+    # when this is unset, but builds using the normal chromium build system.
+    is_android_webview_build = false
+  }
 
-if (is_android) {
   if (is_android_webview_build) {
     assert(android_src != "",
            "You must specify android_src for an Android WebView build.")
   }
 
   # android_ndk_root -----------------------------------------------------------
 
   # Full system path to the Android NDK.
-  android_ndk_root =
-    rebase_path("//third_party/android_tools/ndk", ".", "")
+  android_ndk_root = rebase_path("//third_party/android_tools/ndk")
 
   # stlport stuff --------------------------------------------------------------
 
   use_system_stlport = is_android_webview_build
 
   if (use_system_stlport) {
     android_stlport_library = "stlport"
   } else if (component_mode == "shared_library") {
     android_stlport_library = "stlport_shared"
   } else {
@@ skipping 15 matching lines @@
     android_app_abi = "mips"
   } else {
     assert(false, "Unknown Android ABI")
   }
 } else {
   if (!defined(is_android_webview_build)) {
     is_android_webview_build = false
   }
   use_system_stlport = false
 }