Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: testing/android/native_test.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sync/sync_core.gypi ('k') | third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'target_name': 'native_test_native_code', 10 'target_name': 'native_test_native_code',
(...skipping 10 matching lines...) Expand all
21 ], 21 ],
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 '../../base/base.gyp:base', 24 '../../base/base.gyp:base',
25 '../../base/base.gyp:test_support_base', 25 '../../base/base.gyp:test_support_base',
26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp: dynamic_annotations', 26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp: dynamic_annotations',
27 '../gtest.gyp:gtest', 27 '../gtest.gyp:gtest',
28 'native_test_jni_headers', 28 'native_test_jni_headers',
29 'native_test_util', 29 'native_test_util',
30 ], 30 ],
31 'link_settings': {
32 'libraries': [
33 '-llog',
34 ],
35 },
31 }, 36 },
32 { 37 {
33 'target_name': 'native_test_jni_headers', 38 'target_name': 'native_test_jni_headers',
34 'type': 'none', 39 'type': 'none',
35 'sources': [ 40 'sources': [
36 'java/src/org/chromium/native_test/ChromeNativeTestActivity.java' 41 'java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
37 ], 42 ],
38 'variables': { 43 'variables': {
39 'jni_gen_package': 'testing', 44 'jni_gen_package': 'testing',
40 }, 45 },
(...skipping 14 matching lines...) Expand all
55 'native_test_util.h', 60 'native_test_util.h',
56 ], 61 ],
57 'dependencies': [ 62 'dependencies': [
58 '../../base/base.gyp:base', 63 '../../base/base.gyp:base',
59 ], 64 ],
60 }, 65 },
61 ], 66 ],
62 }] 67 }]
63 ], 68 ],
64 } 69 }
OLDNEW
« no previous file with comments | « sync/sync_core.gypi ('k') | third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698