| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'conditions': [ | 6   'conditions': [ | 
| 7     ['OS=="android"', { | 7     ['OS=="android"', { | 
| 8       'targets': [ | 8       'targets': [ | 
| 9         { | 9         { | 
| 10           # GN: //testing/android:native_test_native_code | 10           # GN: //testing/android:native_test_native_code | 
| 11           'target_name': 'native_test_native_code', | 11           'target_name': 'native_test_native_code', | 
| 12           'message': 'building native pieces of native test package', | 12           'message': 'building native pieces of native test package', | 
| 13           'type': 'static_library', | 13           'type': 'static_library', | 
| 14           'sources': [ | 14           'sources': [ | 
| 15             'native_test_jni_onload.cc', | 15             'native_test_jni_onload.cc', | 
| 16             'native_test_launcher.cc', | 16             'native_test_launcher.cc', | 
| 17             'native_test_launcher.h', | 17             'native_test_launcher.h', | 
| 18           ], | 18           ], | 
| 19           'direct_dependent_settings': { |  | 
| 20             'ldflags!': [ |  | 
| 21               # JNI_OnLoad is implemented in a .a and we need to |  | 
| 22               # re-export in the .so. |  | 
| 23               '-Wl,--exclude-libs=ALL', |  | 
| 24             ], |  | 
| 25           }, |  | 
| 26           'dependencies': [ | 19           'dependencies': [ | 
| 27             '../../base/base.gyp:base', | 20             '../../base/base.gyp:base', | 
| 28             '../../base/base.gyp:test_support_base', | 21             '../../base/base.gyp:test_support_base', | 
| 29             '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:
    dynamic_annotations', | 22             '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:
    dynamic_annotations', | 
| 30             '../gtest.gyp:gtest', | 23             '../gtest.gyp:gtest', | 
| 31             'native_test_jni_headers', | 24             'native_test_jni_headers', | 
| 32             'native_test_util', | 25             'native_test_util', | 
| 33           ], | 26           ], | 
| 34         }, | 27         }, | 
| 35         { | 28         { | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 53             'native_test_util.h', | 46             'native_test_util.h', | 
| 54           ], | 47           ], | 
| 55           'dependencies': [ | 48           'dependencies': [ | 
| 56             '../../base/base.gyp:base', | 49             '../../base/base.gyp:base', | 
| 57           ], | 50           ], | 
| 58         }, | 51         }, | 
| 59       ], | 52       ], | 
| 60     }] | 53     }] | 
| 61   ], | 54   ], | 
| 62 } | 55 } | 
| OLD | NEW | 
|---|