aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Todd Jeffreys <tjeffreys@google.com>2016-03-25 14:33:17 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-03-25 22:00:45 +0000
commit262cf37b06d3a1a5cf8b19cf0f6ff069b971138f (patch)
tree2b0458e8d4859cf9316254fb5b83211f4aeee21f /tools
parent09e62ec6955e618315b5d8833d2fa62f31fc7ae1 (diff)
Correct Bazel's google_play_services built-in custom_package definition, as it is incorrect.
Currently when you build an app using the built-in rule, the resources compile to google.bazel.R, but the GMS libs need com.google.android.gms.R, so InflateExceptions occur - AdView for one. -- MOS_MIGRATED_REVID=118204766
Diffstat (limited to 'tools')
-rw-r--r--tools/android/android_sdk_repository_template.bzl2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl
index 6cf9745112..f81ea1f5e7 100644
--- a/tools/android/android_sdk_repository_template.bzl
+++ b/tools/android/android_sdk_repository_template.bzl
@@ -266,7 +266,7 @@ def create_android_sdk_rules(name, build_tools_version, api_level):
native.android_library(
name = "google_play_services",
- custom_package = "google.bazel",
+ custom_package = "com.google.android.gms",
manifest = GOOGLE_PLAY_SERVICES_DIR + "/AndroidManifest.xml",
exports_manifest = 1,
resource_files = native.glob([GOOGLE_PLAY_SERVICES_DIR + "/res/**"]),