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

Side by Side Diff: trunk/src/net/net.gyp

Issue 292433004: Revert 270750 "Android: cleans up jni_generator_ptr_type." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/mojo/mojo.gyp ('k') | trunk/src/printing/printing.gyp » ('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 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1494 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1495 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1495 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1496 'android/java/src/org/chromium/net/AndroidPrivateKey.java', 1496 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
1497 'android/java/src/org/chromium/net/GURLUtils.java', 1497 'android/java/src/org/chromium/net/GURLUtils.java',
1498 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 1498 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
1499 'android/java/src/org/chromium/net/ProxyChangeListener.java', 1499 'android/java/src/org/chromium/net/ProxyChangeListener.java',
1500 'android/java/src/org/chromium/net/X509Util.java', 1500 'android/java/src/org/chromium/net/X509Util.java',
1501 ], 1501 ],
1502 'variables': { 1502 'variables': {
1503 'jni_gen_package': 'net', 1503 'jni_gen_package': 'net',
1504 'jni_generator_ptr_type': 'long',
1504 }, 1505 },
1505 'includes': [ '../build/jni_generator.gypi' ], 1506 'includes': [ '../build/jni_generator.gypi' ],
1506 1507
1507 'conditions': [ 1508 'conditions': [
1508 ['use_icu_alternatives_on_android==1', { 1509 ['use_icu_alternatives_on_android==1', {
1509 'sources': [ 1510 'sources': [
1510 'android/java/src/org/chromium/net/NetStringUtil.java', 1511 'android/java/src/org/chromium/net/NetStringUtil.java',
1511 ], 1512 ],
1512 }], 1513 }],
1513 ], 1514 ],
1514 }, 1515 },
1515 { 1516 {
1516 'target_name': 'net_test_jni_headers', 1517 'target_name': 'net_test_jni_headers',
1517 'type': 'none', 1518 'type': 'none',
1518 'sources': [ 1519 'sources': [
1519 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ', 1520 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ',
1520 ], 1521 ],
1521 'variables': { 1522 'variables': {
1522 'jni_gen_package': 'net', 1523 'jni_gen_package': 'net',
1524 'jni_generator_ptr_type': 'long',
1523 }, 1525 },
1524 'includes': [ '../build/jni_generator.gypi' ], 1526 'includes': [ '../build/jni_generator.gypi' ],
1525 }, 1527 },
1526 { 1528 {
1527 'target_name': 'net_java', 1529 'target_name': 'net_java',
1528 'type': 'none', 1530 'type': 'none',
1529 'variables': { 1531 'variables': {
1530 'java_in_dir': '../net/android/java', 1532 'java_in_dir': '../net/android/java',
1531 }, 1533 },
1532 'dependencies': [ 1534 'dependencies': [
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1672 'net_unittests.isolate', 1674 'net_unittests.isolate',
1673 ], 1675 ],
1674 'sources': [ 1676 'sources': [
1675 'net_unittests.isolate', 1677 'net_unittests.isolate',
1676 ], 1678 ],
1677 }, 1679 },
1678 ], 1680 ],
1679 }], 1681 }],
1680 ], 1682 ],
1681 } 1683 }
OLDNEW
« no previous file with comments | « trunk/src/mojo/mojo.gyp ('k') | trunk/src/printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698