Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

testing/android/native_test.gyp

 # Copyright (c) 2012 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.
 
 {
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           # GN: //testing/android:native_test_native_code
           'target_name': 'native_test_native_code',
           'message': 'building native pieces of native test package',
           'type': 'static_library',
           'sources': [
             'native_test_jni_onload.cc',
             'native_test_launcher.cc',
             'native_test_launcher.h',
           ],
+          'direct_dependent_settings': {
+            'ldflags!': [
+              # JNI_OnLoad is implemented in a .a and we need to
+              # re-export in the .so.
+              '-Wl,--exclude-libs=ALL',
+            ],
+          },
           'dependencies': [
             '../../base/base.gyp:base',
             '../../base/base.gyp:test_support_base',
             '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gtest.gyp:gtest',
             'native_test_jni_headers',
             'native_test_util',
           ],
         },
         {
@@ skipping 17 matching lines @@
             'native_test_util.h',
           ],
           'dependencies': [
             '../../base/base.gyp:base',
           ],
         },
       ],
     }]
   ],
 }