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, 9 insertions, 8 deletions

diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 45d930813f..d2616c4e43 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -69,28 +69,29 @@ function setup_android_repositories() {
     trap '[ -f WORKSPACE.bak ] && rm WORKSPACE && mv WORKSPACE.bak WORKSPACE' \
       EXIT
     cat >>WORKSPACE <<EOF
-new_local_repository(
-    name = "globbed_android_sdk",
+android_sdk_repository(
+    name = "androidsdk",
     path = "${ANDROID_SDK_PATH}",
-    build_file = "BUILD.glob",
+    build_tools_version = "${ANDROID_SDK_BUILD_TOOLS_VERSION:-22.0.1}",
+    api_level = ${ANDROID_SDK_API_LEVEL:-21},
 )
 
 bind(
     name = "android_sdk_for_testing",
-    actual = "@globbed_android_sdk//:all",
+    actual = "@androidsdk//:files",
 )
 EOF
     if [ -n "${ANDROID_NDK_PATH-}" ]; then
       cat >>WORKSPACE <<EOF
-new_local_repository(
-    name = "globbed_android_ndk",
+android_ndk_repository(
+    name = "androidndk",
     path = "${ANDROID_NDK_PATH}",
-    build_file = "BUILD.glob",
+    api_level = ${ANDROID_NDK_API_LEVEL:-21},
 )
 
 bind(
     name = "android_ndk_for_testing",
-    actual = "@globbed_android_ndk//:all",
+    actual = "@androidndk//:files",
 )
 EOF
     fi