diff options
| author | aberent <aberent@chromium.org> | 2015-02-10 03:18:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 11:18:48 +0000 |
| commit | c8db3ccbde213d09fac41060c0bf81d4a0020cda (patch) | |
| tree | 7246a815e66a2c5d3dc611bef4046453bd2b57ee /build/config/android/config.gni | |
| parent | dd70d94d0664a2d9961037e87b6387a60bbf4ad8 (diff) | |
| download | chromium_src-c8db3ccbde213d09fac41060c0bf81d4a0020cda.zip chromium_src-c8db3ccbde213d09fac41060c0bf81d4a0020cda.tar.gz chromium_src-c8db3ccbde213d09fac41060c0bf81d4a0020cda.tar.bz2 | |
Make Chrome for Android dependent on Google Play Services
Various bits of Chrome for Android that are being upstreamed
(in particular Cast support) require Google Play Services.
This adds Google Play Services to the Android chrome_java
target.
Note that this uses a variable so that one can use an
alternative version of Google Play Services. This is
required for Chrome for Android development.
TBR=sky@chromium.org
BUG=450675
Review URL: https://codereview.chromium.org/865733002
Cr-Commit-Position: refs/heads/master@{#315538}
Diffstat (limited to 'build/config/android/config.gni')
| -rw-r--r-- | build/config/android/config.gni | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 60934c2..7529a44 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -20,6 +20,11 @@ if (is_android) { default_android_sdk_build_tools_version = "21.0.1" } + if (!defined(google_play_services_library)) { + google_play_services_library = + "//third_party/android_tools:google_play_services_default_java" + } + declare_args() { android_sdk_root = default_android_sdk_root android_sdk_version = default_android_sdk_version |