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

Side by Side Diff: net/net.gyp

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove obsolete constants Created 8 years 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
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 2252 matching lines...) Expand 10 before | Expand all | Expand 10 after
2263 { 2263 {
2264 'target_name': 'net_java', 2264 'target_name': 'net_java',
2265 'type': 'none', 2265 'type': 'none',
2266 'variables': { 2266 'variables': {
2267 'package_name': 'net', 2267 'package_name': 'net',
2268 'java_in_dir': '../net/android/java', 2268 'java_in_dir': '../net/android/java',
2269 }, 2269 },
2270 'dependencies': [ 2270 'dependencies': [
2271 '../base/base.gyp:base', 2271 '../base/base.gyp:base',
2272 'net_errors_java', 2272 'net_errors_java',
2273 'certificate_mime_types_java',
2273 ], 2274 ],
2274 'includes': [ '../build/java.gypi' ], 2275 'includes': [ '../build/java.gypi' ],
2275 }, 2276 },
2276 { 2277 {
2277 'target_name': 'net_java_test_support', 2278 'target_name': 'net_java_test_support',
2278 'type': 'none', 2279 'type': 'none',
2279 'variables': { 2280 'variables': {
2280 'package_name': 'net_java_test_support', 2281 'package_name': 'net_java_test_support',
2281 'java_in_dir': '../net/test/android/javatests', 2282 'java_in_dir': '../net/test/android/javatests',
2282 }, 2283 },
(...skipping 17 matching lines...) Expand all
2300 'target_name': 'net_errors_java', 2301 'target_name': 'net_errors_java',
2301 'type': 'none', 2302 'type': 'none',
2302 'sources': [ 2303 'sources': [
2303 'base/net_error_list.h', 2304 'base/net_error_list.h',
2304 'android/java/NetError.template', 2305 'android/java/NetError.template',
2305 ], 2306 ],
2306 'variables': { 2307 'variables': {
2307 'package_name': 'org.chromium.net', 2308 'package_name': 'org.chromium.net',
2308 }, 2309 },
2309 'includes': [ '../build/android/java_cpp_template.gypi' ], 2310 'includes': [ '../build/android/java_cpp_template.gypi' ],
2310 } 2311 },
2312 {
2313 'target_name': 'certificate_mime_types_java',
2314 'type': 'none',
2315 'sources': [
2316 'base/mime_util_certificate_type_list.h',
2317 'android/java/CertificateMimeType.template',
2318 ],
2319 'variables': {
2320 'package_name': 'org.chromium.net',
2321 },
2322 'includes': [ '../build/android/java_cpp_template.gypi' ],
2323 },
2311 ], 2324 ],
2312 }], 2325 }],
2313 # Special target to wrap a gtest_target_type==shared_library 2326 # Special target to wrap a gtest_target_type==shared_library
2314 # net_unittests into an android apk for execution. 2327 # net_unittests into an android apk for execution.
2315 # See base.gyp for TODO(jrg)s about this strategy. 2328 # See base.gyp for TODO(jrg)s about this strategy.
2316 ['OS == "android" and gtest_target_type == "shared_library"', { 2329 ['OS == "android" and gtest_target_type == "shared_library"', {
2317 'targets': [ 2330 'targets': [
2318 { 2331 {
2319 'target_name': 'net_unittests_apk', 2332 'target_name': 'net_unittests_apk',
2320 'type': 'none', 2333 'type': 'none',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
2361 '--result', '<@(_outputs)', 2374 '--result', '<@(_outputs)',
2362 '--isolate', 'net_unittests.isolate', 2375 '--isolate', 'net_unittests.isolate',
2363 ], 2376 ],
2364 }, 2377 },
2365 ], 2378 ],
2366 }, 2379 },
2367 ], 2380 ],
2368 }], 2381 }],
2369 ], 2382 ],
2370 } 2383 }
OLDNEW
« net/base/cert_database_openssl.cc ('K') | « net/base/mime_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698