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

Side by Side Diff: net/net.gyp

Issue 599493004: Use the new java_cpp_enum rule in net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more aosp fix Created 6 years, 2 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
« no previous file with comments | « net/cert/cert_verify_proc_android.cc ('k') | no next file » | 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 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1613 ], 1613 ],
1614 'variables': { 1614 'variables': {
1615 'package_name': 'org/chromium/net', 1615 'package_name': 'org/chromium/net',
1616 'template_deps': ['base/net_error_list.h'], 1616 'template_deps': ['base/net_error_list.h'],
1617 }, 1617 },
1618 'includes': [ '../build/android/java_cpp_template.gypi' ], 1618 'includes': [ '../build/android/java_cpp_template.gypi' ],
1619 }, 1619 },
1620 { 1620 {
1621 'target_name': 'certificate_mime_types_java', 1621 'target_name': 'certificate_mime_types_java',
1622 'type': 'none', 1622 'type': 'none',
1623 'sources': [
1624 'android/java/CertificateMimeType.template',
1625 ],
1626 'variables': { 1623 'variables': {
1627 'package_name': 'org/chromium/net', 1624 'source_file': 'base/mime_util.h',
1628 'template_deps': ['base/mime_util_certificate_type_list.h'],
1629 }, 1625 },
1630 'includes': [ '../build/android/java_cpp_template.gypi' ], 1626 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1631 }, 1627 },
1632 { 1628 {
1633 'target_name': 'cert_verify_status_android_java', 1629 'target_name': 'cert_verify_status_android_java',
1634 'type': 'none', 1630 'type': 'none',
1635 'sources': [
1636 'android/java/CertVerifyStatusAndroid.template',
1637 ],
1638 'variables': { 1631 'variables': {
1639 'package_name': 'org/chromium/net', 1632 'source_file': 'android/cert_verify_result_android.h',
1640 'template_deps': ['android/cert_verify_status_android_list.h'],
1641 }, 1633 },
1642 'includes': [ '../build/android/java_cpp_template.gypi' ], 1634 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1643 }, 1635 },
1644 { 1636 {
1645 'target_name': 'private_key_types_java', 1637 'target_name': 'private_key_types_java',
1646 'type': 'none', 1638 'type': 'none',
1647 'sources': [
1648 'android/java/PrivateKeyType.template',
1649 ],
1650 'variables': { 1639 'variables': {
1651 'package_name': 'org/chromium/net', 1640 'source_file': 'android/keystore.h',
1652 'template_deps': ['android/private_key_type_list.h'],
1653 }, 1641 },
1654 'includes': [ '../build/android/java_cpp_template.gypi' ], 1642 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1655 }, 1643 },
1656 { 1644 {
1657 'target_name': 'net_unittests_apk', 1645 'target_name': 'net_unittests_apk',
1658 'type': 'none', 1646 'type': 'none',
1659 'dependencies': [ 1647 'dependencies': [
1660 'net_java', 1648 'net_java',
1661 'net_javatests', 1649 'net_javatests',
1662 'net_unittests', 1650 'net_unittests',
1663 ], 1651 ],
1664 'variables': { 1652 'variables': {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1696 'net_unittests.isolate', 1684 'net_unittests.isolate',
1697 ], 1685 ],
1698 'sources': [ 1686 'sources': [
1699 'net_unittests.isolate', 1687 'net_unittests.isolate',
1700 ], 1688 ],
1701 }, 1689 },
1702 ], 1690 ],
1703 }], 1691 }],
1704 ], 1692 ],
1705 } 1693 }
OLDNEW
« no previous file with comments | « net/cert/cert_verify_proc_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698