| 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 2232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2243 ], | 2243 ], |
| 2244 'variables': { | 2244 'variables': { |
| 2245 'jni_gen_dir': 'net', | 2245 'jni_gen_dir': 'net', |
| 2246 }, | 2246 }, |
| 2247 'includes': [ '../build/jni_generator.gypi' ], | 2247 'includes': [ '../build/jni_generator.gypi' ], |
| 2248 }, | 2248 }, |
| 2249 { | 2249 { |
| 2250 'target_name': 'net_java', | 2250 'target_name': 'net_java', |
| 2251 'type': 'none', | 2251 'type': 'none', |
| 2252 'variables': { | 2252 'variables': { |
| 2253 'package_name': 'net', | |
| 2254 'java_in_dir': '../net/android/java', | 2253 'java_in_dir': '../net/android/java', |
| 2255 }, | 2254 }, |
| 2256 'dependencies': [ | 2255 'dependencies': [ |
| 2257 '../base/base.gyp:base', | 2256 '../base/base.gyp:base', |
| 2258 'net_errors_java', | 2257 'net_errors_java', |
| 2259 ], | 2258 ], |
| 2260 'includes': [ '../build/java.gypi' ], | 2259 'includes': [ '../build/java.gypi' ], |
| 2261 }, | 2260 }, |
| 2262 { | 2261 { |
| 2263 'target_name': 'net_javatests', | 2262 'target_name': 'net_javatests', |
| 2264 'type': 'none', | 2263 'type': 'none', |
| 2265 'variables': { | 2264 'variables': { |
| 2266 'package_name': 'net_javatests', | |
| 2267 'java_in_dir': '../net/android/javatests', | 2265 'java_in_dir': '../net/android/javatests', |
| 2268 }, | 2266 }, |
| 2269 'dependencies': [ | 2267 'dependencies': [ |
| 2270 '../base/base.gyp:base', | 2268 '../base/base.gyp:base', |
| 2271 '../base/base.gyp:base_java_test_support', | 2269 '../base/base.gyp:base_java_test_support', |
| 2272 'net_java', | 2270 'net_java', |
| 2273 ], | 2271 ], |
| 2274 'includes': [ '../build/java.gypi' ], | 2272 'includes': [ '../build/java.gypi' ], |
| 2275 }, | 2273 }, |
| 2276 { | 2274 { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2385 '--result', '<@(_outputs)', | 2383 '--result', '<@(_outputs)', |
| 2386 '--isolate', 'net_unittests.isolate', | 2384 '--isolate', 'net_unittests.isolate', |
| 2387 ], | 2385 ], |
| 2388 }, | 2386 }, |
| 2389 ], | 2387 ], |
| 2390 }, | 2388 }, |
| 2391 ], | 2389 ], |
| 2392 }], | 2390 }], |
| 2393 ], | 2391 ], |
| 2394 } | 2392 } |
| OLD | NEW |