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

Side by Side Diff: chromecast/chromecast.gyp

Issue 694853002: Chromecast: use more recent Android support lib if available. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: replace with gyp variable Created 6 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'android_support_v13_target%':
8 '../third_party/android_tools/android_tools.gyp:android_support_v13_java lib',
7 'chromium_code': 1, 9 'chromium_code': 1,
8 'chromecast_branding%': 'Chromium', 10 'chromecast_branding%': 'Chromium',
9 }, 11 },
10 'target_defaults': { 12 'target_defaults': {
11 'include_dirs': [ 13 'include_dirs': [
12 '..', # Root of Chromium checkout 14 '..', # Root of Chromium checkout
13 ], 15 ],
14 }, 16 },
15 'targets': [ 17 'targets': [
16 { 18 {
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 'android/chromecast_config_android_stub.cc', 331 'android/chromecast_config_android_stub.cc',
330 'android/platform_jni_loader_stub.cc', 332 'android/platform_jni_loader_stub.cc',
331 ], 333 ],
332 }] 334 }]
333 ], 335 ],
334 }, # end of target 'libcast_shell_android' 336 }, # end of target 'libcast_shell_android'
335 { 337 {
336 'target_name': 'cast_shell_java', 338 'target_name': 'cast_shell_java',
337 'type': 'none', 339 'type': 'none',
338 'dependencies': [ 340 'dependencies': [
341 '<(android_support_v13_target)',
339 '../base/base.gyp:base_java', 342 '../base/base.gyp:base_java',
340 '../content/content.gyp:content_java', 343 '../content/content.gyp:content_java',
341 '../media/media.gyp:media_java', 344 '../media/media.gyp:media_java',
342 '../net/net.gyp:net_java', 345 '../net/net.gyp:net_java',
343 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
344 '../ui/android/ui_android.gyp:ui_java', 346 '../ui/android/ui_android.gyp:ui_java',
345 ], 347 ],
346 'variables': { 348 'variables': {
347 'has_java_resources': 1, 349 'has_java_resources': 1,
348 'java_in_dir': 'browser/android/apk', 350 'java_in_dir': 'browser/android/apk',
349 'resource_dir': 'browser/android/apk/res', 351 'resource_dir': 'browser/android/apk/res',
350 'R_package': 'org.chromium.chromecast.shell', 352 'R_package': 'org.chromium.chromecast.shell',
351 }, 353 },
352 'includes': ['../build/java.gypi'], 354 'includes': ['../build/java.gypi'],
353 }, # end of target 'cast_shell_java' 355 }, # end of target 'cast_shell_java'
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 'sources': [ 462 'sources': [
461 'browser/test/chromecast_browser_test.cc', 463 'browser/test/chromecast_browser_test.cc',
462 'browser/test/chromecast_browser_test.h', 464 'browser/test/chromecast_browser_test.h',
463 'browser/test/chromecast_browser_test_runner.cc', 465 'browser/test/chromecast_browser_test_runner.cc',
464 ], 466 ],
465 }, 467 },
466 ], # end of targets 468 ], # end of targets
467 }], 469 }],
468 ], # end of conditions 470 ], # end of conditions
469 } 471 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698