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

Side by Side Diff: net/net.gyp

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 7 years, 10 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
« no previous file with comments | « media/media.gyp ('k') | sync/sync_android.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 2367 matching lines...) Expand 10 before | Expand all | Expand 10 after
2378 'include_dirs': [ 2378 'include_dirs': [
2379 '<(SHARED_INTERMEDIATE_DIR)/net', 2379 '<(SHARED_INTERMEDIATE_DIR)/net',
2380 ], 2380 ],
2381 }, 2381 },
2382 'includes': [ '../build/jni_generator.gypi' ], 2382 'includes': [ '../build/jni_generator.gypi' ],
2383 }, 2383 },
2384 { 2384 {
2385 'target_name': 'net_java', 2385 'target_name': 'net_java',
2386 'type': 'none', 2386 'type': 'none',
2387 'variables': { 2387 'variables': {
2388 'package_name': 'net',
2389 'java_in_dir': '../net/android/java', 2388 'java_in_dir': '../net/android/java',
2390 }, 2389 },
2391 'dependencies': [ 2390 'dependencies': [
2392 '../base/base.gyp:base', 2391 '../base/base.gyp:base',
2393 'cert_verify_result_android_java', 2392 'cert_verify_result_android_java',
2394 'certificate_mime_types_java', 2393 'certificate_mime_types_java',
2395 'net_errors_java', 2394 'net_errors_java',
2396 'private_key_types_java', 2395 'private_key_types_java',
2397 ], 2396 ],
2398 'includes': [ '../build/java.gypi' ], 2397 'includes': [ '../build/java.gypi' ],
2399 }, 2398 },
2400 { 2399 {
2401 'target_name': 'net_java_test_support', 2400 'target_name': 'net_java_test_support',
2402 'type': 'none', 2401 'type': 'none',
2403 'variables': { 2402 'variables': {
2404 'package_name': 'net_java_test_support',
2405 'java_in_dir': '../net/test/android/javatests', 2403 'java_in_dir': '../net/test/android/javatests',
2406 }, 2404 },
2407 'includes': [ '../build/java.gypi' ], 2405 'includes': [ '../build/java.gypi' ],
2408 }, 2406 },
2409 { 2407 {
2410 'target_name': 'net_javatests', 2408 'target_name': 'net_javatests',
2411 'type': 'none', 2409 'type': 'none',
2412 'variables': { 2410 'variables': {
2413 'package_name': 'net_javatests',
2414 'java_in_dir': '../net/android/javatests', 2411 'java_in_dir': '../net/android/javatests',
2415 }, 2412 },
2416 'dependencies': [ 2413 'dependencies': [
2417 '../base/base.gyp:base', 2414 '../base/base.gyp:base',
2418 '../base/base.gyp:base_java_test_support', 2415 '../base/base.gyp:base_java_test_support',
2419 'net_java', 2416 'net_java',
2420 ], 2417 ],
2421 'includes': [ '../build/java.gypi' ], 2418 'includes': [ '../build/java.gypi' ],
2422 }, 2419 },
2423 { 2420 {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
2522 '--result', '<@(_outputs)', 2519 '--result', '<@(_outputs)',
2523 '--isolate', 'net_unittests.isolate', 2520 '--isolate', 'net_unittests.isolate',
2524 ], 2521 ],
2525 }, 2522 },
2526 ], 2523 ],
2527 }, 2524 },
2528 ], 2525 ],
2529 }], 2526 }],
2530 ], 2527 ],
2531 } 2528 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | sync/sync_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698