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

Side by Side Diff: net/net.gyp

Issue 1474603004: Remove Android support for out-of-process KeyStores (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated comments Created 5 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
« no previous file with comments | « net/android/net_jni_registrar.cc ('k') | net/net.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 ], 1366 ],
1367 'includes': [ 'net_common.gypi' ], 1367 'includes': [ 'net_common.gypi' ],
1368 }, 1368 },
1369 { 1369 {
1370 'target_name': 'net_jni_headers', 1370 'target_name': 'net_jni_headers',
1371 'type': 'none', 1371 'type': 'none',
1372 'sources': [ 1372 'sources': [
1373 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1373 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
1374 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1374 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1375 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1375 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1376 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
1377 'android/java/src/org/chromium/net/AndroidTrafficStats.java', 1376 'android/java/src/org/chromium/net/AndroidTrafficStats.java',
1378 'android/java/src/org/chromium/net/GURLUtils.java', 1377 'android/java/src/org/chromium/net/GURLUtils.java',
1379 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java', 1378 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
1380 'android/java/src/org/chromium/net/NetStringUtil.java', 1379 'android/java/src/org/chromium/net/NetStringUtil.java',
1381 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 1380 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
1382 'android/java/src/org/chromium/net/ProxyChangeListener.java', 1381 'android/java/src/org/chromium/net/ProxyChangeListener.java',
1383 'android/java/src/org/chromium/net/X509Util.java', 1382 'android/java/src/org/chromium/net/X509Util.java',
1384 ], 1383 ],
1385 'variables': { 1384 'variables': {
1386 'jni_gen_package': 'net', 1385 'jni_gen_package': 'net',
(...skipping 20 matching lines...) Expand all
1407 'java_in_dir': '../net/android/java', 1406 'java_in_dir': '../net/android/java',
1408 }, 1407 },
1409 'dependencies': [ 1408 'dependencies': [
1410 '../base/base.gyp:base', 1409 '../base/base.gyp:base',
1411 'cert_verify_status_android_java', 1410 'cert_verify_status_android_java',
1412 'certificate_mime_types_java', 1411 'certificate_mime_types_java',
1413 'network_change_notifier_types_java', 1412 'network_change_notifier_types_java',
1414 'network_change_notifier_android_types_java', 1413 'network_change_notifier_android_types_java',
1415 'net_errors_java', 1414 'net_errors_java',
1416 'private_key_types_java', 1415 'private_key_types_java',
1417 'remote_android_keystore_aidl',
1418 'traffic_stats_error_java', 1416 'traffic_stats_error_java',
1419 ], 1417 ],
1420 'includes': [ '../build/java.gypi' ], 1418 'includes': [ '../build/java.gypi' ],
1421 }, 1419 },
1422 { 1420 {
1423 # Processes the interface files for communication with an Android KeyS tore
1424 # running in a separate process.
1425 'target_name': 'remote_android_keystore_aidl',
1426 'type': 'none',
1427 'variables': {
1428 'aidl_interface_file': '../net/android/java/src/org/chromium/net/IRe moteAndroidKeyStoreInterface.aidl',
1429 },
1430 'sources': [
1431 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aid l',
1432 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCall backs.aidl',
1433 ],
1434 'includes': [ '../build/java_aidl.gypi' ],
1435 },
1436 {
1437 'target_name': 'net_java_test_support', 1421 'target_name': 'net_java_test_support',
1438 'type': 'none', 1422 'type': 'none',
1439 'variables': { 1423 'variables': {
1440 'java_in_dir': '../net/test/android/javatests', 1424 'java_in_dir': '../net/test/android/javatests',
1441 # TODO(jbudorick): remove chromium_code: 0 line once crbug.com/48819 2 is fixed. 1425 # TODO(jbudorick): remove chromium_code: 0 line once crbug.com/48819 2 is fixed.
1442 'chromium_code': 0, 1426 'chromium_code': 0,
1443 }, 1427 },
1444 'dependencies': [ 1428 'dependencies': [
1445 'net_java', 1429 'net_java',
1446 'net_test_support', 1430 'net_test_support',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 '../build/isolate.gypi', 1635 '../build/isolate.gypi',
1652 ], 1636 ],
1653 'sources': [ 1637 'sources': [
1654 'net_unittests.isolate', 1638 'net_unittests.isolate',
1655 ], 1639 ],
1656 }, 1640 },
1657 ], 1641 ],
1658 }], 1642 }],
1659 ], 1643 ],
1660 } 1644 }
OLDNEW
« no previous file with comments | « net/android/net_jni_registrar.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698