commit 507bb1a1e68bda20a3e5f2a8738f6d24b35f63c1
author Benjamin Lerman <qsr@chromium.org> Thu Feb 26 13:15:17 2015 +0100
committer Benjamin Lerman <qsr@chromium.org> Thu Feb 26 13:15:17 2015 +0100
tree a4dcf38855d21ae4318eb1377797c028665370de
parent bd03be70adb5f8b1c40e2c5f105ac4cfc308e655

Update from https://crrev.com/318214

TBR=qsr@chromium.org

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

build/jni_generator.gypi

diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index 853b5f6..c2c71e7 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -36,7 +36,7 @@
     'jni_generator_includes%': (
         'base/android/jni_generator/jni_generator_helper.h'
     ),
-    'native_exports%': '',
+    'native_exports%': '--native_exports_optional',
   },
   'rules': [
     {
@@ -92,14 +92,6 @@
         '<(DEPTH)/build/android/android_exports.gyp:android_exports',
       ],
     }],
-    ['clang==0', {
-      # 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
-      'variables': {
-        'native_exports%': '--native_exports_optional',
-      },
-    }],
   ],
 }