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

Side by Side Diff: net/net.gyp

Issue 10662056: Revert "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, 5 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 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 '../third_party/openssl/openssl.gyp:openssl', 1383 '../third_party/openssl/openssl.gyp:openssl',
1384 ], 1384 ],
1385 'sources!': [ 1385 'sources!': [
1386 'dns/dns_config_service_posix_unittest.cc', 1386 'dns/dns_config_service_posix_unittest.cc',
1387 ], 1387 ],
1388 }, 1388 },
1389 ], 1389 ],
1390 ['OS == "android" and gtest_target_type == "shared_library"', { 1390 ['OS == "android" and gtest_target_type == "shared_library"', {
1391 'dependencies': [ 1391 'dependencies': [
1392 '../testing/android/native_test.gyp:native_test_native_code', 1392 '../testing/android/native_test.gyp:native_test_native_code',
1393 ], 1393 ]
1394 'defines': [
1395 'REGISTER_NET_UNITESTS_JNI',
1396 ],
1397 }], 1394 }],
1398 [ 'OS != "win" and OS != "mac"', { 1395 [ 'OS != "win" and OS != "mac"', {
1399 'sources!': [ 1396 'sources!': [
1400 'base/x509_cert_types_unittest.cc', 1397 'base/x509_cert_types_unittest.cc',
1401 ], 1398 ],
1402 }] 1399 }]
1403 ], 1400 ],
1404 }, 1401 },
1405 { 1402 {
1406 'target_name': 'net_unittests_run', 1403 'target_name': 'net_unittests_run',
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 'tools/dump_cache/url_to_filename_encoder.cc', 1952 'tools/dump_cache/url_to_filename_encoder.cc',
1956 'tools/dump_cache/url_to_filename_encoder.h', 1953 'tools/dump_cache/url_to_filename_encoder.h',
1957 'tools/dump_cache/url_utilities.h', 1954 'tools/dump_cache/url_utilities.h',
1958 'tools/dump_cache/url_utilities.cc', 1955 'tools/dump_cache/url_utilities.cc',
1959 ], 1956 ],
1960 }, 1957 },
1961 ], 1958 ],
1962 }], 1959 }],
1963 ], 1960 ],
1964 } 1961 }
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