Merge "Add visibility to be used for apex_compression_test"
diff --git a/BUILD.bazel b/BUILD.bazel
index 3669a9a..0b6e2d5 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -33,15 +33,15 @@
 toolchain(
     name = "android_sdk_tools",
     exec_compatible_with = [
-        "@bazel_tools//platforms:x86_64",
-        "@bazel_tools//platforms:linux",
+        "//build/bazel/platforms/arch:x86_64",
+        "//build/bazel/platforms/os:linux",
     ],
     # TODO(b/175833893): This causes the toolchain to not be selected, so
     # disable for now.
     #target_compatible_with = [
-    #    "@bazel_tools//platforms:android",
+    #    "//build/bazel/platforms/os:android",
     #],
-    toolchain = "@//prebuilts/sdk:android_sdk",
+    toolchain = ":android_sdk",
     toolchain_type = "@rules_android//toolchains/android_sdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -72,11 +72,11 @@
 toolchain(
     name = "android_sdk_tools_for_native_android_binary",
     exec_compatible_with = [
-        "@bazel_tools//platforms:x86_64",
-        "@bazel_tools//platforms:linux",
+        "//build/bazel/platforms/arch:x86_64",
+        "//build/bazel/platforms/os:linux",
     ],
     target_compatible_with = [
-        "@bazel_tools//platforms:android",
+        "//build/bazel/platforms/os:android",
     ],
     toolchain = ":android_sdk",
     toolchain_type = "@bazel_tools//tools/android:sdk_toolchain_type",