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

Unified 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: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index d7a25e809e2ba12b89b850c0bef8305278698aab..a1ad7cd6c2fc2f93e586acf4634c60fa60a9b4dc 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -340,7 +340,6 @@
'../content/content.gyp:content_java',
'../media/media.gyp:media_java',
'../net/net.gyp:net_java',
- '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
'../ui/android/ui_android.gyp:ui_java',
],
'variables': {
@@ -350,6 +349,17 @@
'R_package': 'org.chromium.chromecast.shell',
},
'includes': ['../build/java.gypi'],
+ 'conditions': [
+ ['chromecast_branding=="Chrome"', {
+ 'dependencies': [
+ '../third_party/android_tools_internal/android_tools.gyp:android_support_v13_javalib_L',
byungchul 2014/10/31 17:36:22 It is not available in ToT. Any other way to repla
gunsch 2014/10/31 18:02:25 Neither are any of the internal GYP references tha
+ ],
+ }, {
+ 'dependencies': [
+ '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
+ ],
+ }],
+ ],
}, # end of target 'cast_shell_java'
{
'target_name': 'cast_shell_apk',
« 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