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

Side by Side Diff: net/net.gyp

Issue 1879743002: Expose cellular signal strength on Android to native (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Paul's comments Created 4 years, 6 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
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 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 ], 1369 ],
1370 }, 1370 },
1371 ] 1371 ]
1372 }], 1372 }],
1373 ['OS=="android"', { 1373 ['OS=="android"', {
1374 'targets': [ 1374 'targets': [
1375 { 1375 {
1376 'target_name': 'net_jni_headers', 1376 'target_name': 'net_jni_headers',
1377 'type': 'none', 1377 'type': 'none',
1378 'sources': [ 1378 'sources': [
1379 'android/java/src/org/chromium/net/AndroidCellularSignalStrength.jav a',
1379 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1380 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
1380 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1381 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1381 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1382 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1382 'android/java/src/org/chromium/net/AndroidTrafficStats.java', 1383 'android/java/src/org/chromium/net/AndroidTrafficStats.java',
1383 'android/java/src/org/chromium/net/GURLUtils.java', 1384 'android/java/src/org/chromium/net/GURLUtils.java',
1384 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java', 1385 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
1385 'android/java/src/org/chromium/net/NetStringUtil.java', 1386 'android/java/src/org/chromium/net/NetStringUtil.java',
1386 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 1387 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
1387 'android/java/src/org/chromium/net/ProxyChangeListener.java', 1388 'android/java/src/org/chromium/net/ProxyChangeListener.java',
1388 'android/java/src/org/chromium/net/X509Util.java', 1389 'android/java/src/org/chromium/net/X509Util.java',
(...skipping 17 matching lines...) Expand all
1406 'includes': [ '../build/jni_generator.gypi' ], 1407 'includes': [ '../build/jni_generator.gypi' ],
1407 }, 1408 },
1408 { 1409 {
1409 'target_name': 'net_java', 1410 'target_name': 'net_java',
1410 'type': 'none', 1411 'type': 'none',
1411 'variables': { 1412 'variables': {
1412 'java_in_dir': '../net/android/java', 1413 'java_in_dir': '../net/android/java',
1413 }, 1414 },
1414 'dependencies': [ 1415 'dependencies': [
1415 '../base/base.gyp:base', 1416 '../base/base.gyp:base',
1417 'cellular_signal_strength_error_java',
1416 'cert_verify_status_android_java', 1418 'cert_verify_status_android_java',
1417 'certificate_mime_types_java', 1419 'certificate_mime_types_java',
1418 'network_change_notifier_types_java', 1420 'network_change_notifier_types_java',
1419 'network_change_notifier_android_types_java', 1421 'network_change_notifier_android_types_java',
1420 'net_errors_java', 1422 'net_errors_java',
1421 'private_key_types_java', 1423 'private_key_types_java',
1422 'traffic_stats_error_java', 1424 'traffic_stats_error_java',
1423 ], 1425 ],
1424 'includes': [ '../build/java.gypi' ], 1426 'includes': [ '../build/java.gypi' ],
1425 }, 1427 },
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1536 'sources': [ 1538 'sources': [
1537 'android/java/NetError.template', 1539 'android/java/NetError.template',
1538 ], 1540 ],
1539 'variables': { 1541 'variables': {
1540 'package_name': 'org/chromium/net', 1542 'package_name': 'org/chromium/net',
1541 'template_deps': ['base/net_error_list.h'], 1543 'template_deps': ['base/net_error_list.h'],
1542 }, 1544 },
1543 'includes': [ '../build/android/java_cpp_template.gypi' ], 1545 'includes': [ '../build/android/java_cpp_template.gypi' ],
1544 }, 1546 },
1545 { 1547 {
1548 'target_name': 'cellular_signal_strength_error_java',
1549 'type': 'none',
1550 'variables': {
1551 'source_file': 'android/cellular_signal_strength.cc',
1552 },
1553 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1554 },
1555 {
1546 'target_name': 'certificate_mime_types_java', 1556 'target_name': 'certificate_mime_types_java',
1547 'type': 'none', 1557 'type': 'none',
1548 'variables': { 1558 'variables': {
1549 'source_file': 'base/mime_util.h', 1559 'source_file': 'base/mime_util.h',
1550 }, 1560 },
1551 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1561 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1552 }, 1562 },
1553 { 1563 {
1554 'target_name': 'cert_verify_status_android_java', 1564 'target_name': 'cert_verify_status_android_java',
1555 'type': 'none', 1565 'type': 'none',
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1742 '../build/isolate.gypi', 1752 '../build/isolate.gypi',
1743 ], 1753 ],
1744 'sources': [ 1754 'sources': [
1745 'net_unittests.isolate', 1755 'net_unittests.isolate',
1746 ], 1756 ],
1747 }, 1757 },
1748 ], 1758 ],
1749 }], 1759 }],
1750 ], 1760 ],
1751 } 1761 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698