Remove -fstack-protector-strong from the ChromeOS GN build.

This trybots said this was an unknown option, so the comment I was basing my
usage of "strong" on in common.gypi must be out-of-date. The GYP build does not
seem to specify "strong" in any cases except on Mac.

Hook up compiler finding to the Android build.

R=jam@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242746 0039d316-1c4b-4281-b951-d872f2087c98

build/config/compiler/BUILD.gn

@@ -32,11 +32,8 @@ config("compiler") {
     ]
 
     # Stack protection.
-    # TODO(brettw) why do we have different values for all of these cases?
     if (is_mac) {
       cflags += "-fstack-protector-all"
-    } else if (is_chromeos) {
-      cflags += "-fstack-protector-strong"
     } else if (is_linux) {
       cflags += [ "-fstack-protector", "--param=ssp-buffer-size=4" ]
     }

build/toolchain/android/BUILD.gn

@@ -44,10 +44,8 @@ if (is_gyp) {
 
     # This script will find the compilers for the given Android toolchain
     # directory.
-    # TODO(brettw) write this script which locates the Android compilers.
-    #android_compilers = exec_script("find_android_compilers.py",
-    #                                [android_toolchain], "value")
-    android_compilers = ["gcc", "g++", "gcc", "g++"]
+    android_compilers = exec_script("find_android_compiler.py",
+                                    [android_toolchain], "value")
     gyp_header =
       "'make_global_settings': [" +
       "['CC', '" + android_compilers[0] + "']," +

build/toolchain/linux/find_android_compilers.py → build/toolchain/android/find_android_compiler.py

@@ -19,8 +19,18 @@
 android_toolchain = sys.argv[1]
 cc = glob.glob(android_toolchain + "/*-gcc")
 cxx = glob.glob(android_toolchain + "/*-g++")
+
+# We tolerate "no matches." In the Android AOSP WebView build, it runs this
+# logic and the directory doesn't exist, giving no matches. But that build runs
+# GYP to generate Android Makefiles which specify the compiler separately. So
+# all we need to do in this case is ignore the error and continue with empty
+# target compilers.
+if len(cc) == 0:
+  cc = [""]
+if len(cxx) == 0:
+  cxx = [""]
 if len(cc) != 1 or len(cxx) != 1:
-  print "Either none or more than one matching compiler."
+  print "More than one matching compiler."
   sys.exit(1)
 
 # Get the host compilers from the current path.