Remove BUILD.glob and incorporate the necessary filegroups into the android_{ndk,sdk}_repository rules themselves.

This is to that the Android tests also work on OS X (otherwise, we'd end up creating a file called "BUILD" in its root, which doesn't work, because it already has a directory called "build")

--
MOS_MIGRATED_REVID=102484286

1 files changed, 11 insertions, 10 deletions

diff --git a/WORKSPACE b/WORKSPACE
index ff17d5f52c..fcbae48939 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -58,17 +58,18 @@ new_http_archive(
 
 # In order to run the Android integration tests, uncomment these rules, point
 # them to the Android NDK and the SDK, and point the bind rules under them
-# to @repository//:all.
-# new_local_repository(
-#     name = "globbed_android_sdk",
-#     path = "/usr/local/google/home/lberki/android/android-sdk-linux",
-#     build_file = "BUILD.glob"
+# to @repository//:files .
+# android_sdk_repository(
+#     name = "androidsdk",
+#     path = "/path/to/sdk",
+#     build_tools_version = "21.1.1",
+#     api_level = 19,
 # )
-#
-# new_local_repository(
-#     name = "globbed_android_ndk",
-#     path = "/usr/local/google/home/lberki/android/android-ndk",
-#     build_file = "BUILD.glob"
+
+# android_ndk_repository(
+#     name = "androidndk",
+#     path = "/path/to/ndk",
+#     api_level = 19,
 # )
 
 bind(