GN: Remove android arguments from the conditional

This will make it possible to pull GN binaries on Linux which is currently blocked on the Android AOSP bot complaining about unused parameters.

TBR=scottmg

Review URL: https://codereview.chromium.org/157273002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249642 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

config/android/config.gni

@@ -3,16 +3,21 @@
 # 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 = ""
+
+  # 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) {
-  declare_args() {
-    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
-  }
-
   if (is_android_webview_build) {
     assert(android_src != "",
            "You must specify android_src for an Android WebView build.")