| OLD | NEW |
| 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 Loading... |
| 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/gurl_utils.cc', |
| 60 'android/gurl_utils.h', |
| 59 'android/net_jni_registrar.cc', | 61 'android/net_jni_registrar.cc', |
| 60 'android/net_jni_registrar.h', | 62 'android/net_jni_registrar.h', |
| 61 'android/network_change_notifier_android.cc', | 63 'android/network_change_notifier_android.cc', |
| 62 'android/network_change_notifier_android.h', | 64 'android/network_change_notifier_android.h', |
| 63 'android/network_change_notifier_delegate_android.cc', | 65 'android/network_change_notifier_delegate_android.cc', |
| 64 'android/network_change_notifier_delegate_android.h', | 66 'android/network_change_notifier_delegate_android.h', |
| 65 'android/network_change_notifier_factory_android.cc', | 67 'android/network_change_notifier_factory_android.cc', |
| 66 'android/network_change_notifier_factory_android.h', | 68 'android/network_change_notifier_factory_android.h', |
| 67 'android/network_library.cc', | 69 'android/network_library.cc', |
| 68 'android/network_library.h', | 70 'android/network_library.h', |
| (...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2252 }, | 2254 }, |
| 2253 ] | 2255 ] |
| 2254 }], | 2256 }], |
| 2255 ['OS=="android"', { | 2257 ['OS=="android"', { |
| 2256 'targets': [ | 2258 'targets': [ |
| 2257 { | 2259 { |
| 2258 'target_name': 'net_jni_headers', | 2260 'target_name': 'net_jni_headers', |
| 2259 'type': 'none', | 2261 'type': 'none', |
| 2260 'sources': [ | 2262 'sources': [ |
| 2261 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', | 2263 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', |
| 2264 'android/java/src/org/chromium/net/GURLUtils.java', |
| 2262 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', | 2265 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', |
| 2263 'android/java/src/org/chromium/net/ProxyChangeListener.java', | 2266 'android/java/src/org/chromium/net/ProxyChangeListener.java', |
| 2264 ], | 2267 ], |
| 2265 'variables': { | 2268 'variables': { |
| 2266 'jni_gen_dir': 'net', | 2269 'jni_gen_dir': 'net', |
| 2267 }, | 2270 }, |
| 2268 'includes': [ '../build/jni_generator.gypi' ], | 2271 'includes': [ '../build/jni_generator.gypi' ], |
| 2269 }, | 2272 }, |
| 2270 { | 2273 { |
| 2271 'target_name': 'net_java', | 2274 'target_name': 'net_java', |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2381 '--result', '<@(_outputs)', | 2384 '--result', '<@(_outputs)', |
| 2382 '--isolate', 'net_unittests.isolate', | 2385 '--isolate', 'net_unittests.isolate', |
| 2383 ], | 2386 ], |
| 2384 }, | 2387 }, |
| 2385 ], | 2388 ], |
| 2386 }, | 2389 }, |
| 2387 ], | 2390 ], |
| 2388 }], | 2391 }], |
| 2389 ], | 2392 ], |
| 2390 } | 2393 } |
| OLD | NEW |