Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 8ca064248e268036fbc7c1bc9231cca055da7fa0..33dfa37e6c2a33f3a31da77494c5a227540b2976 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -74,12 +74,6 @@ template("generate_jni") {
         rebase_path(jni_generator_jarjar_file, root_build_dir),
       ]
     }
-    if (!is_clang) {
-      # Clang builds currently fail with --native_exports_optional due to
-      # http://llvm.org/bugs/show_bug.cgi?id=22602 - only enable for gcc.
-      # http://crbug.com/442327
-      args += [ "--native_exports_optional" ]
-    }
   }
 
   config("jni_includes_${target_name}") {
@@ -190,12 +184,6 @@ template("generate_jar_jni") {
         "--includes",
         rebase_path(jni_generator_include, root_build_dir),
       ]
-      if (!is_clang) {
-        # Clang builds currently fail with --native_exports_optional due to
-        # http://llvm.org/bugs/show_bug.cgi?id=22602 - only enable for gcc.
-        # http://crbug.com/442327
-        args += [ "--native_exports_optional" ]
-      }
     }
   }
 
@@ -358,7 +346,9 @@ template("java_cpp_enum") {
 
   action("${target_name}__generate_enum") {
     # The sources aren't compiled so don't check their dependencies.
-    check_includes = false
+    # TODO(brettw) uncomment after GN binary rolled pas 314974 (which added
+    # support for this value on actions).
+    #check_includes = false
 
     sources = invoker.sources
     script = "//build/android/gyp/java_cpp_enum.py"