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

Side by Side Diff: net/net.gyp

Issue 11571059: Add net/android/keystore.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: new version with simpler signing support Created 7 years, 11 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
« net/android/keystore.h ('K') | « net/android/net_jni_registrar.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 49 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
50 '../build/temp_gyp/googleurl.gyp:googleurl', 50 '../build/temp_gyp/googleurl.gyp:googleurl',
51 '../crypto/crypto.gyp:crypto', 51 '../crypto/crypto.gyp:crypto',
52 '../sdch/sdch.gyp:sdch', 52 '../sdch/sdch.gyp:sdch',
53 '../third_party/icu/icu.gyp:icui18n', 53 '../third_party/icu/icu.gyp:icui18n',
54 '../third_party/icu/icu.gyp:icuuc', 54 '../third_party/icu/icu.gyp:icuuc',
55 '../third_party/zlib/zlib.gyp:zlib', 55 '../third_party/zlib/zlib.gyp:zlib',
56 'net_resources', 56 'net_resources',
57 ], 57 ],
58 'sources': [ 58 'sources': [
59 'android/keystore.cc',
60 'android/keystore.h',
59 'android/gurl_utils.cc', 61 'android/gurl_utils.cc',
60 'android/gurl_utils.h', 62 'android/gurl_utils.h',
61 'android/net_jni_registrar.cc', 63 'android/net_jni_registrar.cc',
62 'android/net_jni_registrar.h', 64 'android/net_jni_registrar.h',
63 'android/network_change_notifier_android.cc', 65 'android/network_change_notifier_android.cc',
64 'android/network_change_notifier_android.h', 66 'android/network_change_notifier_android.h',
65 'android/network_change_notifier_delegate_android.cc', 67 'android/network_change_notifier_delegate_android.cc',
66 'android/network_change_notifier_delegate_android.h', 68 'android/network_change_notifier_delegate_android.h',
67 'android/network_change_notifier_factory_android.cc', 69 'android/network_change_notifier_factory_android.cc',
68 'android/network_change_notifier_factory_android.h', 70 'android/network_change_notifier_factory_android.h',
(...skipping 2205 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 ], 2276 ],
2275 }, 2277 },
2276 ] 2278 ]
2277 }], 2279 }],
2278 ['OS=="android"', { 2280 ['OS=="android"', {
2279 'targets': [ 2281 'targets': [
2280 { 2282 {
2281 'target_name': 'net_jni_headers', 2283 'target_name': 'net_jni_headers',
2282 'type': 'none', 2284 'type': 'none',
2283 'sources': [ 2285 'sources': [
2286 'android/java/src/org/chromium/net/AndroidKeyStore.java',
2284 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 2287 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
2285 'android/java/src/org/chromium/net/GURLUtils.java', 2288 'android/java/src/org/chromium/net/GURLUtils.java',
2286 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 2289 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
2287 'android/java/src/org/chromium/net/ProxyChangeListener.java', 2290 'android/java/src/org/chromium/net/ProxyChangeListener.java',
2288 ], 2291 ],
2289 'variables': { 2292 'variables': {
2290 'jni_gen_dir': 'net', 2293 'jni_gen_dir': 'net',
2291 }, 2294 },
2292 'includes': [ '../build/jni_generator.gypi' ], 2295 'includes': [ '../build/jni_generator.gypi' ],
2293 }, 2296 },
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 '--result', '<@(_outputs)', 2408 '--result', '<@(_outputs)',
2406 '--isolate', 'net_unittests.isolate', 2409 '--isolate', 'net_unittests.isolate',
2407 ], 2410 ],
2408 }, 2411 },
2409 ], 2412 ],
2410 }, 2413 },
2411 ], 2414 ],
2412 }], 2415 }],
2413 ], 2416 ],
2414 } 2417 }
OLDNEW
« net/android/keystore.h ('K') | « net/android/net_jni_registrar.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698