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