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

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: 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
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 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 'java_in_dir': '../net/android/java', 1387 'java_in_dir': '../net/android/java',
1388 }, 1388 },
1389 'dependencies': [ 1389 'dependencies': [
1390 '../base/base.gyp:base', 1390 '../base/base.gyp:base',
1391 'cert_verify_status_android_java', 1391 'cert_verify_status_android_java',
1392 'certificate_mime_types_java', 1392 'certificate_mime_types_java',
1393 'network_change_notifier_types_java', 1393 'network_change_notifier_types_java',
1394 'network_change_notifier_android_types_java', 1394 'network_change_notifier_android_types_java',
1395 'net_errors_java', 1395 'net_errors_java',
1396 'private_key_types_java', 1396 'private_key_types_java',
1397 'remote_android_keystore_aidl',
1398 'traffic_stats_error_java', 1397 'traffic_stats_error_java',
1399 ], 1398 ],
1400 'includes': [ '../build/java.gypi' ], 1399 'includes': [ '../build/java.gypi' ],
1401 }, 1400 },
1402 { 1401 {
1403 # Processes the interface files for communication with an Android KeyS tore
1404 # running in a separate process.
1405 'target_name': 'remote_android_keystore_aidl',
1406 'type': 'none',
1407 'variables': {
1408 'aidl_interface_file': '../net/android/java/src/org/chromium/net/IRe moteAndroidKeyStoreInterface.aidl',
1409 },
1410 'sources': [
1411 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aid l',
1412 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCall backs.aidl',
1413 ],
1414 'includes': [ '../build/java_aidl.gypi' ],
1415 },
1416 {
1417 'target_name': 'net_java_test_support', 1402 'target_name': 'net_java_test_support',
1418 'type': 'none', 1403 'type': 'none',
1419 'variables': { 1404 'variables': {
1420 'java_in_dir': '../net/test/android/javatests', 1405 'java_in_dir': '../net/test/android/javatests',
1421 # TODO(jbudorick): remove chromium_code: 0 line once crbug.com/48819 2 is fixed. 1406 # TODO(jbudorick): remove chromium_code: 0 line once crbug.com/48819 2 is fixed.
1422 'chromium_code': 0, 1407 'chromium_code': 0,
1423 }, 1408 },
1424 'dependencies': [ 1409 'dependencies': [
1425 'net_java', 1410 'net_java',
1426 'net_test_support', 1411 'net_test_support',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 '../build/isolate.gypi', 1616 '../build/isolate.gypi',
1632 ], 1617 ],
1633 'sources': [ 1618 'sources': [
1634 'net_unittests.isolate', 1619 'net_unittests.isolate',
1635 ], 1620 ],
1636 }, 1621 },
1637 ], 1622 ],
1638 }], 1623 }],
1639 ], 1624 ],
1640 } 1625 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698