Index: chrome/chrome.gyp |
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp |
index 96cddd93ec40ede121e063327843372172c5add6..96074d9e05a8bd41875620101d4b06254ecdcca1 100644 |
--- a/chrome/chrome.gyp |
+++ b/chrome/chrome.gyp |
@@ -606,6 +606,7 @@ |
'profile_account_management_metrics_java', |
'content_setting_java', |
'content_settings_type_java', |
+ '<(google_play_services_library_target)', |
nyquist
2015/01/22 01:21:43
I would have liked it better if this was a proxy t
aberent
2015/01/22 16:28:55
Done.
|
'page_info_connection_type_java', |
'profile_sync_service_model_type_selection_java', |
'resource_id_java', |
@@ -623,6 +624,7 @@ |
'../printing/printing.gyp:printing_java', |
'../sync/sync.gyp:sync_java', |
'../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib', |
+ '../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib', |
aberent
2015/01/21 23:56:27
Noticed this after uploading. Accidental leak from
aberent
2015/01/22 16:28:55
Done.
|
'../third_party/android_tools/android_tools.gyp:android_support_v13_javalib', |
'../third_party/libaddressinput/libaddressinput.gyp:android_addressinput_widget', |
'../ui/android/ui_android.gyp:ui_java', |
@@ -681,7 +683,10 @@ |
], # 'targets' |
'includes': [ |
'chrome_android.gypi', |
- ]}, # 'includes' |
+ ], # 'includes' |
+ 'variables': { |
+ 'google_play_services_library_target%': '../third_party/android_tools/android_tools.gyp:google_play_services_javalib', |
nyquist
2015/01/22 01:23:38
I believe that the extras folder is only downloade
aberent
2015/01/22 16:28:55
It has been added to install-build-deps-android.sh
|
+ }}, #variables |
], # OS=="android" |
['configuration_policy==1 and OS!="android" and OS!="ios"', { |
'includes': [ 'policy.gypi', ], |