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

Side by Side Diff: net/net.gyp

Issue 10658017: Use a test specific macro to call JNI registrars during APK tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | testing/android/native_test_launcher.cc » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1363 '../third_party/openssl/openssl.gyp:openssl', 1363 '../third_party/openssl/openssl.gyp:openssl',
1364 ], 1364 ],
1365 'sources!': [ 1365 'sources!': [
1366 'dns/dns_config_service_posix_unittest.cc', 1366 'dns/dns_config_service_posix_unittest.cc',
1367 ], 1367 ],
1368 }, 1368 },
1369 ], 1369 ],
1370 ['OS == "android" and gtest_target_type == "shared_library"', { 1370 ['OS == "android" and gtest_target_type == "shared_library"', {
1371 'dependencies': [ 1371 'dependencies': [
1372 '../testing/android/native_test.gyp:native_test_native_code', 1372 '../testing/android/native_test.gyp:native_test_native_code',
1373 ] 1373 ],
1374 'defines': [
1375 'REGISTER_NET_UNITESTS_JNI',
1376 ],
1374 }], 1377 }],
1375 [ 'OS != "win" and OS != "mac"', { 1378 [ 'OS != "win" and OS != "mac"', {
1376 'sources!': [ 1379 'sources!': [
1377 'base/x509_cert_types_unittest.cc', 1380 'base/x509_cert_types_unittest.cc',
1378 ], 1381 ],
1379 }] 1382 }]
1380 ], 1383 ],
1381 }, 1384 },
1382 { 1385 {
1383 'target_name': 'net_unittests_run', 1386 'target_name': 'net_unittests_run',
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 'tools/dump_cache/url_to_filename_encoder.cc', 1935 'tools/dump_cache/url_to_filename_encoder.cc',
1933 'tools/dump_cache/url_to_filename_encoder.h', 1936 'tools/dump_cache/url_to_filename_encoder.h',
1934 'tools/dump_cache/url_utilities.h', 1937 'tools/dump_cache/url_utilities.h',
1935 'tools/dump_cache/url_utilities.cc', 1938 'tools/dump_cache/url_utilities.cc',
1936 ], 1939 ],
1937 }, 1940 },
1938 ], 1941 ],
1939 }], 1942 }],
1940 ], 1943 ],
1941 } 1944 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | testing/android/native_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698