commit 25fc8d37f87e76c67c137403abd6d5e19e500977
author Lukacs Berki <lberki@google.com> Mon Sep 21 08:22:12 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Mon Sep 21 09:00:45 2015 +0000
tree a53649103f4074da95f1deaf2b999e8914f1f53d
parent 029af2857334005c9b930823073c90e577f2f004

Add a "Google Play Services" target to android_sdk_repository that can be references as "//external:android/google_play_services".

Note that android_sdk_repository itself works okay even if this package is not downloaded from the Android SDK package manager (of course, rules that depend on the missing code will fail to build)

--
MOS_MIGRATED_REVID=103525330

src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
index ca70a09..6630a8b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
@@ -47,6 +47,8 @@
           String prefix = "@" + rule.getName() + "//:";
           return ImmutableMap.of(
               "android/sdk", Label.parseAbsoluteUnchecked(prefix + "sdk"),
+              "android/google_play_services",
+              Label.parseAbsoluteUnchecked(prefix + "google_play_services"),
               "android/appcompat_v4", Label.parseAbsoluteUnchecked(prefix + "appcompat_v4"),
               "android/appcompat_v7", Label.parseAbsoluteUnchecked(prefix + "appcompat_v7"));
         }

src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
index aa899ac..18ccb99 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
@@ -162,3 +162,18 @@
 java_import(
     name = "sdklib",
     jars = ["tools/lib/sdklib.jar", "tools/lib/common.jar", "tools/lib/guava-17.0.jar"])
+
+GOOGLE_PLAY_SERVICES_DIR = "extras/google/google_play_services/libproject/google-play-services_lib"
+
+java_import(
+    name = "google_play_services_lib",
+    jars = [GOOGLE_PLAY_SERVICES_DIR + "/libs/google-play-services.jar"])
+
+android_library(
+    name = "google_play_services",
+    custom_package = "google.bazel",
+    manifest = GOOGLE_PLAY_SERVICES_DIR + "/AndroidManifest.xml",
+    exports_manifest = 1,
+    resource_files = glob([GOOGLE_PLAY_SERVICES_DIR + "/res/**"]),
+    proguard_specs = [GOOGLE_PLAY_SERVICES_DIR + "/proguard.txt"],
+    deps = [":google_play_services_lib"])