Snap for 8481309 from cb27d5539fb14167e8db05532a8463a384657fbb to studio-dolphin-releasestudio-2021.3.1-betastudio-2021.3.1studio-beta

Change-Id: Ic05edf5b37781c28952de137576de995d2c2e4fe

2 files changed, 31 insertions, 31 deletions

diff --git a/BUILD b/BUILD
index 76641c70..631aef3a 100644
--- a/BUILD
+++ b/BUILD
@@ -6,9 +6,9 @@ load("@bazel_tools//tools/jdk:local_java_repository.bzl", "local_java_runtime")
 filegroup(
     name = "jdk",
     srcs = ["BUILD"] + select({
-        "//tools/base/bazel:darwin": glob(["mac/**"]),
-        "//tools/base/bazel:windows": glob(["win64/**"]),
-        "//conditions:default": glob(["linux/**"]),
+        "@platforms//os:macos": glob(["mac/**"]),
+        "@platforms//os:windows": glob(["win64/**"]),
+        "@platforms//os:linux": glob(["linux/**"]),
     }),
 )
 
@@ -51,9 +51,9 @@ studio_data(
 filegroup(
     name = "jdk11",
     srcs = ["BUILD"] + select({
-        "//tools/base/bazel:darwin": glob(["jdk11/mac/**"]),
-        "//tools/base/bazel:windows": glob(["jdk11/win/**"]),
-        "//conditions:default": glob(["jdk11/linux/**"]),
+        "@platforms//os:macos": glob(["jdk11/mac/**"]),
+        "@platforms//os:windows": glob(["jdk11/win/**"]),
+        "@platforms//os:linux": glob(["jdk11/linux/**"]),
     }),
 )
 
@@ -68,15 +68,15 @@ filegroup(
 filegroup(
     name = "langtools",
     srcs = select({
-        "//tools/base/bazel:darwin": [
+        "@platforms//os:macos": [
             "mac/Contents/Home/jre/lib/jce.jar",
             "mac/Contents/Home/lib/tools.jar",
         ],
-        "//tools/base/bazel:windows": [
+        "@platforms//os:windows": [
             "win64/jre/lib/jce.jar",
             "win64/lib/tools.jar",
         ],
-        "//conditions:default": [
+        "@platforms//os:linux": [
             "linux/jre/lib/jce.jar",
             "linux/lib/tools.jar",
         ],
@@ -86,15 +86,15 @@ filegroup(
 filegroup(
     name = "bootclasspath",
     srcs = select({
-        "//tools/base/bazel:darwin": glob([
+        "@platforms//os:macos": glob([
             "mac/Contents/Home/jre/lib/*.jar",
             "mac/Contents/Home/jre/lib/ext/*.jar",
         ]),
-        "//tools/base/bazel:windows": glob([
+        "@platforms//os:windows": glob([
             "win32/jre/lib/*.jar",
             "win32/jre/lib/ext/*.jar",
         ]),
-        "//conditions:default": glob([
+        "@platforms//os:linux": glob([
             "linux/jre/lib/*.jar",
             "linux/jre/lib/ext/*.jar",
         ]),
@@ -105,20 +105,20 @@ cc_library(
     name = "jni_headers",
     srcs = [],
     hdrs = select({
-        "//tools/base/bazel:darwin": glob(["mac/Contents/Home/include/**/*.h"]),
-        "//tools/base/bazel:windows": glob(["win64/include/**/*.h"]),
+        "@platforms//os:macos": glob(["mac/Contents/Home/include/**/*.h"]),
+        "@platforms//os:windows": glob(["win64/include/**/*.h"]),
         "//tools/base/bazel:android_cpu_x86": [],
         "//tools/base/bazel:android_cpu_x86_64": [],
         "//tools/base/bazel:android_cpu_arm": [],
         "//tools/base/bazel:android_cpu_arm_64": [],
-        "//conditions:default": glob(["linux/include/**/*.h"]),
+        "@platforms//os:linux": glob(["linux/include/**/*.h"]),
     }),
     includes = select({
-        "//tools/base/bazel:darwin": [
+        "@platforms//os:macos": [
             "mac/Contents/Home/include",
             "mac/Contents/Home/include/darwin",
         ],
-        "//tools/base/bazel:windows": [
+        "@platforms//os:windows": [
             "win64/include",
             "win64/include/win32",
             "win64/include/win32/bridge",
@@ -127,7 +127,7 @@ cc_library(
         "//tools/base/bazel:android_cpu_x86_64": [],
         "//tools/base/bazel:android_cpu_arm": [],
         "//tools/base/bazel:android_cpu_arm_64": [],
-        "//conditions:default": [
+        "@platforms//os:linux": [
             "linux/include",
             "linux/include/linux",
         ],
@@ -144,28 +144,28 @@ cc_library(
 java_runtime(
     name = "jdk_runtime",
     srcs = select({
-        "//tools/base/bazel:darwin": glob(["mac/**"]),
-        "//tools/base/bazel:windows": glob(["win64/**"]),
-        "//conditions:default": glob(["linux/**"]),
+        "@platforms//os:macos": glob(["mac/**"]),
+        "@platforms//os:windows": glob(["win64/**"]),
+        "@platforms//os:linux": glob(["linux/**"]),
     }),
     java_home = select({
-        "//tools/base/bazel:darwin": "mac/Contents/Home",
-        "//tools/base/bazel:windows": "win64",
-        "//conditions:default": "linux",
+        "@platforms//os:macos": "mac/Contents/Home",
+        "@platforms//os:windows": "win64",
+        "@platforms//os:linux": "linux",
     }),
 )
 
 java_runtime(
     name = "jdk11_runtime",
     srcs = select({
-        "//tools/base/bazel:darwin": glob(["jdk11/mac/**"]),
-        "//tools/base/bazel:windows": glob(["jdk11/win/**"]),
-        "//conditions:default": glob(["jdk11/linux/**"]),
+        "@platforms//os:macos": glob(["jdk11/mac/**"]),
+        "@platforms//os:windows": glob(["jdk11/win/**"]),
+        "@platforms//os:linux": glob(["jdk11/linux/**"]),
     }),
     java_home = select({
-        "//tools/base/bazel:darwin": "jdk11/mac/Contents/Home",
-        "//tools/base/bazel:windows": "jdk11/win",
-        "//conditions:default": "jdk11/linux",
+        "@platforms//os:macos": "jdk11/mac/Contents/Home",
+        "@platforms//os:windows": "jdk11/win",
+        "@platforms//os:linux": "jdk11/linux",
     }),
 )
 
diff --git a/BUILD.studio_jdk b/BUILD.studio_jdk
index b7e0b058..dff77cef 100644
--- a/BUILD.studio_jdk
+++ b/BUILD.studio_jdk
@@ -13,7 +13,7 @@ filegroup(
             "win64/jre/lib/jce.jar",
             "win64/lib/tools.jar",
         ],
-        "//conditions:default": [
+        "@platforms//os:linux": [
             "linux/jre/lib/jce.jar",
             "linux/lib/tools.jar",
         ],