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

Side by Side Diff: net/net.gyp

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/http/transport_security_state_static.json ('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 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1563 { 1563 {
1564 'target_name': 'net_java', 1564 'target_name': 'net_java',
1565 'type': 'none', 1565 'type': 'none',
1566 'variables': { 1566 'variables': {
1567 'java_in_dir': '../net/android/java', 1567 'java_in_dir': '../net/android/java',
1568 }, 1568 },
1569 'dependencies': [ 1569 'dependencies': [
1570 '../base/base.gyp:base', 1570 '../base/base.gyp:base',
1571 'cert_verify_status_android_java', 1571 'cert_verify_status_android_java',
1572 'certificate_mime_types_java', 1572 'certificate_mime_types_java',
1573 'network_change_notifier_types_java',
1573 'net_errors_java', 1574 'net_errors_java',
1574 'private_key_types_java', 1575 'private_key_types_java',
1575 'remote_android_keystore_aidl', 1576 'remote_android_keystore_aidl',
1576 ], 1577 ],
1577 'includes': [ '../build/java.gypi' ], 1578 'includes': [ '../build/java.gypi' ],
1578 }, 1579 },
1579 { 1580 {
1580 # Processes the interface files for communication with an Android KeyS tore 1581 # Processes the interface files for communication with an Android KeyS tore
1581 # running in a separate process. 1582 # running in a separate process.
1582 'target_name': 'remote_android_keystore_aidl', 1583 'target_name': 'remote_android_keystore_aidl',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 }, 1634 },
1634 { 1635 {
1635 'target_name': 'cert_verify_status_android_java', 1636 'target_name': 'cert_verify_status_android_java',
1636 'type': 'none', 1637 'type': 'none',
1637 'variables': { 1638 'variables': {
1638 'source_file': 'android/cert_verify_result_android.h', 1639 'source_file': 'android/cert_verify_result_android.h',
1639 }, 1640 },
1640 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1641 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1641 }, 1642 },
1642 { 1643 {
1644 'target_name': 'network_change_notifier_types_java',
1645 'type': 'none',
1646 'variables': {
1647 'source_file': 'base/network_change_notifier.h',
1648 },
1649 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1650 },
1651 {
1643 'target_name': 'private_key_types_java', 1652 'target_name': 'private_key_types_java',
1644 'type': 'none', 1653 'type': 'none',
1645 'variables': { 1654 'variables': {
1646 'source_file': 'android/keystore.h', 1655 'source_file': 'android/keystore.h',
1647 }, 1656 },
1648 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1657 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1649 }, 1658 },
1650 { 1659 {
1651 'target_name': 'net_unittests_apk', 1660 'target_name': 'net_unittests_apk',
1652 'type': 'none', 1661 'type': 'none',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1718 '../build/isolate.gypi', 1727 '../build/isolate.gypi',
1719 ], 1728 ],
1720 'sources': [ 1729 'sources': [
1721 'net_unittests.isolate', 1730 'net_unittests.isolate',
1722 ], 1731 ],
1723 }, 1732 },
1724 ], 1733 ],
1725 }], 1734 }],
1726 ], 1735 ],
1727 } 1736 }
OLDNEW
« no previous file with comments | « net/http/transport_security_state_static.json ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698