| 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 2344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2355 '../base/base.gyp:base', | 2355 '../base/base.gyp:base', |
| 2356 '../base/base.gyp:base_java_test_support', | 2356 '../base/base.gyp:base_java_test_support', |
| 2357 'net_java', | 2357 'net_java', |
| 2358 ], | 2358 ], |
| 2359 'includes': [ '../build/java.gypi' ], | 2359 'includes': [ '../build/java.gypi' ], |
| 2360 }, | 2360 }, |
| 2361 { | 2361 { |
| 2362 'target_name': 'net_errors_java', | 2362 'target_name': 'net_errors_java', |
| 2363 'type': 'none', | 2363 'type': 'none', |
| 2364 'sources': [ | 2364 'sources': [ |
| 2365 'base/net_error_list.h', | |
| 2366 'android/java/NetError.template', | 2365 'android/java/NetError.template', |
| 2367 ], | 2366 ], |
| 2368 'variables': { | 2367 'variables': { |
| 2369 'package_name': 'org.chromium.net', | 2368 'package_name': 'org.chromium.net', |
| 2369 'template_deps': ['base/net_error_list.h'], |
| 2370 }, | 2370 }, |
| 2371 'includes': [ '../build/android/java_cpp_template.gypi' ], | 2371 'includes': [ '../build/android/java_cpp_template.gypi' ], |
| 2372 }, | 2372 }, |
| 2373 { | 2373 { |
| 2374 'target_name': 'certificate_mime_types_java', | 2374 'target_name': 'certificate_mime_types_java', |
| 2375 'type': 'none', | 2375 'type': 'none', |
| 2376 'sources': [ | 2376 'sources': [ |
| 2377 'base/mime_util_certificate_type_list.h', | |
| 2378 'android/java/CertificateMimeType.template', | 2377 'android/java/CertificateMimeType.template', |
| 2379 ], | 2378 ], |
| 2380 'variables': { | 2379 'variables': { |
| 2381 'package_name': 'org.chromium.net', | 2380 'package_name': 'org.chromium.net', |
| 2381 'template_deps': ['base/mime_util_certificate_type_list.h'], |
| 2382 }, | 2382 }, |
| 2383 'includes': [ '../build/android/java_cpp_template.gypi' ], | 2383 'includes': [ '../build/android/java_cpp_template.gypi' ], |
| 2384 }, | 2384 }, |
| 2385 ], | 2385 ], |
| 2386 }], | 2386 }], |
| 2387 # Special target to wrap a gtest_target_type==shared_library | 2387 # Special target to wrap a gtest_target_type==shared_library |
| 2388 # net_unittests into an android apk for execution. | 2388 # net_unittests into an android apk for execution. |
| 2389 # See base.gyp for TODO(jrg)s about this strategy. | 2389 # See base.gyp for TODO(jrg)s about this strategy. |
| 2390 ['OS == "android" and gtest_target_type == "shared_library"', { | 2390 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 2391 'targets': [ | 2391 'targets': [ |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2435 '--result', '<@(_outputs)', | 2435 '--result', '<@(_outputs)', |
| 2436 '--isolate', 'net_unittests.isolate', | 2436 '--isolate', 'net_unittests.isolate', |
| 2437 ], | 2437 ], |
| 2438 }, | 2438 }, |
| 2439 ], | 2439 ], |
| 2440 }, | 2440 }, |
| 2441 ], | 2441 ], |
| 2442 }], | 2442 }], |
| 2443 ], | 2443 ], |
| 2444 } | 2444 } |
| OLD | NEW |