Move bazel conditions into src/conditions.
This will enable an easier transition from checked-in BUILD files to ones generated by copybara.
RELNOTES: None
PiperOrigin-RevId: 177514519
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index 1c6cf4a..1b85823 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -15,18 +15,18 @@
filegroup(
name = "packages",
srcs = select({
- "//src:windows": [
+ "//src/conditions:windows": [
":zip-bazel-exe",
":zip-bazel-exe_with_jdk",
],
- "//src:windows_msvc": [],
- "//src:freebsd": [],
- "//src:darwin": [
+ "//src/conditions:windows_msvc": [],
+ "//src/conditions:freebsd": [],
+ "//src/conditions:darwin": [
":with-jdk/install.sh",
":without-jdk/install.sh",
":generate-package-info",
],
- "//src:darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
":with-jdk/install.sh",
":without-jdk/install.sh",
":generate-package-info",
diff --git a/src/BUILD b/src/BUILD
index a813665..de49f41 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -8,11 +8,11 @@
filegroup(
name = "libunix",
srcs = select({
- ":darwin": ["//src/main/native:libunix.dylib"],
- ":darwin_x86_64": ["//src/main/native:libunix.dylib"],
- ":windows": ["//src/main/native/windows:windows_jni.dll"],
- ":windows_msys": ["//src/main/native/windows:windows_jni.dll"],
- ":windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:darwin": ["//src/main/native:libunix.dylib"],
+ "//src/conditions:darwin_x86_64": ["//src/main/native:libunix.dylib"],
+ "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
"//conditions:default": ["//src/main/native:libunix.so"],
}),
visibility = [
@@ -34,9 +34,9 @@
] + embedded_tools_target,
outs = ["install_base_key" + suffix],
cmd = select({
- ":darwin": md5_cmd % "/sbin/md5",
- ":darwin_x86_64": md5_cmd % "/sbin/md5",
- ":freebsd": md5_cmd % "/sbin/md5",
+ "//src/conditions:darwin": md5_cmd % "/sbin/md5",
+ "//src/conditions:darwin_x86_64": md5_cmd % "/sbin/md5",
+ "//src/conditions:freebsd": md5_cmd % "/sbin/md5",
"//conditions:default": md5_cmd % "md5sum",
}),
) for suffix, embedded_tools_target in {
@@ -109,7 +109,7 @@
"//src/tools/xcode/realpath:realpath",
"//tools/osx:xcode_locator.m",
] + select({
- ":iphonesdk": ["//src/tools/xcode/stdredirect:StdRedirect.dylib"],
+ "//src/conditions:iphonesdk": ["//src/tools/xcode/stdredirect:StdRedirect.dylib"],
"//conditions:default": [":dummy_darwin_tool_src_tools_xcode_stdredirect_StdRedirect.dylib"],
}),
)
@@ -149,6 +149,7 @@
"//third_party/py/concurrent:srcs",
"//third_party/py/gflags:srcs",
"//third_party/py/six:srcs",
+ "//src/conditions:embedded_tools",
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
"//src/tools/android/java/com/google/devtools/build/android:embedded_tools",
"//src/tools/launcher:srcs",
@@ -171,10 +172,10 @@
"//third_party/java/jacoco:srcs",
"//third_party/zlib:embedded_tools",
] + select({
- ":darwin": [
+ "//src/conditions:darwin": [
":darwin_tools",
],
- ":darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
":darwin_tools",
],
"//conditions:default": [
@@ -183,41 +184,41 @@
}) + select({
# TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/2241
# is resolved, use cc implementation of singlejar on windows
- ":windows": [
+ "//src/conditions:windows": [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//src/tools/launcher:launcher",
"//third_party/def_parser:def_parser",
],
- ":windows_msys": [
+ "//src/conditions:windows_msys": [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//src/tools/launcher:launcher",
"//third_party/def_parser:def_parser",
],
- ":windows_msvc": [
+ "//src/conditions:windows_msvc": [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//src/tools/launcher:launcher",
"//third_party/def_parser:def_parser",
],
- ":arm": [
+ "//src/conditions:arm": [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
],
"//conditions:default": [
"//src/tools/singlejar:singlejar",
],
}) + (select({
- ":darwin": [
+ "//src/conditions:darwin": [
"@openjdk_macos//file",
],
- ":darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
"@openjdk_macos//file",
],
- ":windows_msys": [
+ "//src/conditions:windows_msys": [
"@openjdk_win//file",
],
- ":windows_msvc": [
+ "//src/conditions:windows_msvc": [
"@openjdk_win//file",
],
- ":windows": [
+ "//src/conditions:windows": [
"@openjdk_win//file",
],
"//conditions:default": [
@@ -334,69 +335,10 @@
"_with_jdk",
]]
-config_setting(
- name = "linux_x86_64",
- values = {"cpu": "k8"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "darwin",
- values = {"cpu": "darwin"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "darwin_x86_64",
- values = {"cpu": "darwin_x86_64"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "iphonesdk",
- values = {"define": "IPHONE_SDK=1"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "freebsd",
- values = {"cpu": "freebsd"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "windows",
- values = {"cpu": "x64_windows"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "windows_msvc",
- values = {"cpu": "x64_windows_msvc"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "windows_msys",
- values = {"cpu": "x64_windows_msys"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "arm",
- values = {"cpu": "arm"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "remote",
- values = {"define": "EXECUTOR=remote"},
- visibility = ["//visibility:public"],
-)
-
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
+ "//src/conditions:srcs",
"//src/java_tools/buildjar:srcs",
"//src/java_tools/junitrunner:srcs",
"//src/java_tools/singlejar:srcs",
@@ -487,3 +429,17 @@
"//third_party/def_parser:all_windows_tests",
],
)
+
+# config_setting alias left here because bazel-only third_party code is pointing to it
+alias(
+ name = "windows",
+ actual = "//src/conditions:windows",
+ visibility = ["//visibility:public"],
+)
+
+# config_setting alias left here because bazel-only third_party code is pointing to it
+alias(
+ name = "windows_msvc",
+ actual = "//src/conditions:windows_msvc",
+ visibility = ["//visibility:public"],
+)
diff --git a/src/BUILD.tools b/src/BUILD.tools
index 280be65..721c043 100644
--- a/src/BUILD.tools
+++ b/src/BUILD.tools
@@ -1,59 +1,14 @@
-config_setting(
- name = "freebsd",
- values = {"cpu": "freebsd"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "darwin",
- values = {"cpu": "darwin"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "darwin_x86_64",
- values = {"cpu": "darwin_x86_64"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
+# config_setting alias left here because bazel-only third_party code is pointing to it
+alias(
name = "windows",
- values = {"cpu": "x64_windows"},
+ actual = "//src/conditions:windows",
visibility = ["//visibility:public"],
)
-config_setting(
+# config_setting alias left here because bazel-only third_party code is pointing to it
+alias(
name = "windows_msvc",
- values = {"cpu": "x64_windows_msvc"},
+ actual = "//src/conditions:windows_msvc",
visibility = ["//visibility:public"],
)
-config_setting(
- name = "windows_msys",
- values = {"cpu": "x64_windows_msys"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "host_windows",
- values = {"host_cpu": "x64_windows"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "host_windows_msvc",
- values = {"host_cpu": "x64_windows_msvc"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "host_windows_msys",
- values = {"host_cpu": "x64_windows_msys"},
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "remote",
- values = {"define": "EXECUTOR=remote"},
- visibility = ["//visibility:public"],
-)
diff --git a/src/conditions/BUILD b/src/conditions/BUILD
new file mode 100644
index 0000000..9853f1f
--- /dev/null
+++ b/src/conditions/BUILD
@@ -0,0 +1,71 @@
+filegroup(
+ name = "srcs",
+ srcs = glob(["**"]),
+ visibility = ["//src:__pkg__"],
+)
+
+filegroup(
+ name = "embedded_tools",
+ srcs = ["BUILD.tools"],
+ visibility = ["//src:__pkg__"],
+)
+
+config_setting(
+ name = "linux_x86_64",
+ values = {"cpu": "k8"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "darwin",
+ values = {"cpu": "darwin"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "darwin_x86_64",
+ values = {"cpu": "darwin_x86_64"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "iphonesdk",
+ values = {"define": "IPHONE_SDK=1"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "freebsd",
+ values = {"cpu": "freebsd"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "windows",
+ values = {"cpu": "x64_windows"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "windows_msvc",
+ values = {"cpu": "x64_windows_msvc"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "windows_msys",
+ values = {"cpu": "x64_windows_msys"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "arm",
+ values = {"cpu": "arm"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "remote",
+ values = {"define": "EXECUTOR=remote"},
+ visibility = ["//visibility:public"],
+)
diff --git a/src/conditions/BUILD.tools b/src/conditions/BUILD.tools
new file mode 100644
index 0000000..280be65
--- /dev/null
+++ b/src/conditions/BUILD.tools
@@ -0,0 +1,59 @@
+config_setting(
+ name = "freebsd",
+ values = {"cpu": "freebsd"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "darwin",
+ values = {"cpu": "darwin"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "darwin_x86_64",
+ values = {"cpu": "darwin_x86_64"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "windows",
+ values = {"cpu": "x64_windows"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "windows_msvc",
+ values = {"cpu": "x64_windows_msvc"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "windows_msys",
+ values = {"cpu": "x64_windows_msys"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "host_windows",
+ values = {"host_cpu": "x64_windows"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "host_windows_msvc",
+ values = {"host_cpu": "x64_windows_msvc"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "host_windows_msys",
+ values = {"host_cpu": "x64_windows_msys"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
+ name = "remote",
+ values = {"define": "EXECUTOR=remote"},
+ visibility = ["//visibility:public"],
+)
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
index cbd0654..052b01a 100644
--- a/src/main/cpp/BUILD
+++ b/src/main/cpp/BUILD
@@ -18,25 +18,25 @@
"global_variables.h",
"startup_options.h",
] + select({
- "//src:darwin": [
+ "//src/conditions:darwin": [
"blaze_util_darwin.cc",
"blaze_util_posix.cc",
],
- "//src:darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
"blaze_util_darwin.cc",
"blaze_util_posix.cc",
],
- "//src:freebsd": [
+ "//src/conditions:freebsd": [
"blaze_util_freebsd.cc",
"blaze_util_posix.cc",
],
- "//src:windows": [
+ "//src/conditions:windows": [
"blaze_util_windows.cc",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
"blaze_util_windows.cc",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
"blaze_util_windows.cc",
],
"//conditions:default": [
@@ -49,16 +49,16 @@
"blaze_util_platform.h",
],
linkopts = select({
- "//src:darwin": [
+ "//src/conditions:darwin": [
"-framework CoreFoundation",
],
- "//src:darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
"-framework CoreFoundation",
],
- "//src:freebsd": [
+ "//src/conditions:freebsd": [
],
- "//src:windows": WIN_LINK_OPTS,
- "//src:windows_msvc": WIN_LINK_OPTS,
+ "//src/conditions:windows": WIN_LINK_OPTS,
+ "//src/conditions:windows_msvc": WIN_LINK_OPTS,
"//conditions:default": [
"-lrt",
],
@@ -67,9 +67,9 @@
"//src/main/cpp/util",
"//src/main/cpp/util:blaze_exit_code",
] + select({
- "//src:windows": ["//src/main/native/windows:lib-file"],
- "//src:windows_msys": ["//src/main/native/windows:lib-file"],
- "//src:windows_msvc": ["//src/main/native/windows:lib-file"],
+ "//src/conditions:windows": ["//src/main/native/windows:lib-file"],
+ "//src/conditions:windows_msys": ["//src/main/native/windows:lib-file"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:lib-file"],
"//conditions:default": [],
}),
)
@@ -83,25 +83,25 @@
"global_variables.h",
"main.cc",
] + select({
- "//src:windows": ["//src/main/native/windows:resources.o"],
- "//src:windows_msvc": ["//src/main/native/windows:resources.o"],
+ "//src/conditions:windows": ["//src/main/native/windows:resources.o"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:resources.o"],
"//conditions:default": [],
}),
copts = select({
- "//src:windows": ["/wd4018"],
- "//src:windows_msvc": ["/wd4018"],
+ "//src/conditions:windows": ["/wd4018"],
+ "//src/conditions:windows_msvc": ["/wd4018"],
"//conditions:default": ["-Wno-sign-compare"],
}),
linkopts = select({
- "//src:darwin": [
+ "//src/conditions:darwin": [
],
- "//src:darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
],
- "//src:freebsd": [
+ "//src/conditions:freebsd": [
"-lprocstat",
"-lm",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
],
"//conditions:default": [
"-lrt",
diff --git a/src/main/cpp/util/BUILD b/src/main/cpp/util/BUILD
index 2efd031..4dd12cd 100644
--- a/src/main/cpp/util/BUILD
+++ b/src/main/cpp/util/BUILD
@@ -32,13 +32,13 @@
cc_library(
name = "file",
srcs = ["file.cc"] + select({
- "//src:windows": [
+ "//src/conditions:windows": [
"file_windows.cc",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
"file_windows.cc",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
"file_windows.cc",
],
"//conditions:default": [
@@ -61,9 +61,9 @@
":errors",
":strings",
] + select({
- "//src:windows": ["//src/main/native/windows:lib-file"],
- "//src:windows_msys": ["//src/main/native/windows:lib-file"],
- "//src:windows_msvc": ["//src/main/native/windows:lib-file"],
+ "//src/conditions:windows": ["//src/main/native/windows:lib-file"],
+ "//src/conditions:windows_msys": ["//src/main/native/windows:lib-file"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:lib-file"],
"//conditions:default": [],
}),
)
@@ -71,9 +71,9 @@
cc_library(
name = "errors",
srcs = ["errors.cc"] + select({
- "//src:windows": ["errors_windows.cc"],
- "//src:windows_msys": ["errors_windows.cc"],
- "//src:windows_msvc": ["errors_windows.cc"],
+ "//src/conditions:windows": ["errors_windows.cc"],
+ "//src/conditions:windows_msys": ["errors_windows.cc"],
+ "//src/conditions:windows_msvc": ["errors_windows.cc"],
"//conditions:default": ["errors_posix.cc"],
}),
hdrs = ["errors.h"],
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index bfbdd97..310f57f 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -76,9 +76,9 @@
]) + ["UnixJniLoader.java"],
resources = select({
# todo(dslomov): Get rid of this whole library on Windows.
- "//src:windows": [],
- "//src:windows_msys": [],
- "//src:windows_msvc": [],
+ "//src/conditions:windows": [],
+ "//src/conditions:windows_msys": [],
+ "//src/conditions:windows_msvc": [],
"//conditions:default": ["//src/main/native:libunix.so"],
}),
deps = [
diff --git a/src/main/native/BUILD b/src/main/native/BUILD
index 84ed004..ea70385 100644
--- a/src/main/native/BUILD
+++ b/src/main/native/BUILD
@@ -1,11 +1,11 @@
genrule(
name = "copy_link_jni_md_header",
srcs = select({
- "//src:darwin": ["//tools/jdk:jni_md_header-darwin"],
- "//src:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"],
- "//src:freebsd": ["//tools/jdk:jni_md_header-freebsd"],
- "//src:windows": ["//tools/jdk:jni_md_header-windows"],
- "//src:windows_msvc": ["//tools/jdk:jni_md_header-windows"],
+ "//src/conditions:darwin": ["//tools/jdk:jni_md_header-darwin"],
+ "//src/conditions:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"],
+ "//src/conditions:freebsd": ["//tools/jdk:jni_md_header-freebsd"],
+ "//src/conditions:windows": ["//tools/jdk:jni_md_header-windows"],
+ "//src/conditions:windows_msvc": ["//tools/jdk:jni_md_header-windows"],
"//conditions:default": ["//tools/jdk:jni_md_header-linux"],
}),
outs = ["jni_md.h"],
@@ -24,15 +24,15 @@
filegroup(
name = "jni_os",
srcs = select({
- "//src:darwin": [
+ "//src/conditions:darwin": [
"unix_jni_darwin.cc",
"fsevents.cc",
],
- "//src:darwin_x86_64": [
+ "//src/conditions:darwin_x86_64": [
"unix_jni_darwin.cc",
"fsevents.cc",
],
- "//src:freebsd": ["unix_jni_freebsd.cc"],
+ "//src/conditions:freebsd": ["unix_jni_freebsd.cc"],
"//conditions:default": ["unix_jni_linux.cc"],
}),
)
@@ -54,8 +54,8 @@
],
includes = ["."], # For jni headers.
linkopts = select({
- "//src:darwin": ["-framework CoreServices"],
- "//src:darwin_x86_64": ["-framework CoreServices"],
+ "//src/conditions:darwin": ["-framework CoreServices"],
+ "//src/conditions:darwin_x86_64": ["-framework CoreServices"],
"//conditions:default": [],
}),
linkshared = 1,
diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
index 9319b0a..b6250a2 100644
--- a/src/main/tools/BUILD
+++ b/src/main/tools/BUILD
@@ -19,8 +19,8 @@
cc_binary(
name = "process-wrapper",
srcs = select({
- "//src:windows": ["process-wrapper-windows.cc"],
- "//src:windows_msvc": ["process-wrapper-windows.cc"],
+ "//src/conditions:windows": ["process-wrapper-windows.cc"],
+ "//src/conditions:windows_msvc": ["process-wrapper-windows.cc"],
"//conditions:default": [
"process-wrapper.cc",
"process-wrapper.h",
@@ -32,8 +32,8 @@
}),
linkopts = ["-lm"],
deps = select({
- "//src:windows": [],
- "//src:windows_msvc": [],
+ "//src/conditions:windows": [],
+ "//src/conditions:windows_msvc": [],
"//conditions:default": [
":process-tools",
":logging",
@@ -44,8 +44,8 @@
cc_binary(
name = "build-runfiles",
srcs = select({
- "//src:windows": ["build-runfiles-windows.cc"],
- "//src:windows_msvc": ["build-runfiles-windows.cc"],
+ "//src/conditions:windows": ["build-runfiles-windows.cc"],
+ "//src/conditions:windows_msvc": ["build-runfiles-windows.cc"],
"//conditions:default": ["build-runfiles.cc"],
}),
)
@@ -53,12 +53,12 @@
cc_binary(
name = "linux-sandbox",
srcs = select({
- "//src:darwin": ["dummy-sandbox.c"],
- "//src:darwin_x86_64": ["dummy-sandbox.c"],
- "//src:freebsd": ["dummy-sandbox.c"],
- "//src:windows": ["dummy-sandbox.c"],
- "//src:windows_msys": ["dummy-sandbox.c"],
- "//src:windows_msvc": ["dummy-sandbox.c"],
+ "//src/conditions:darwin": ["dummy-sandbox.c"],
+ "//src/conditions:darwin_x86_64": ["dummy-sandbox.c"],
+ "//src/conditions:freebsd": ["dummy-sandbox.c"],
+ "//src/conditions:windows": ["dummy-sandbox.c"],
+ "//src/conditions:windows_msys": ["dummy-sandbox.c"],
+ "//src/conditions:windows_msvc": ["dummy-sandbox.c"],
"//conditions:default": [
"linux-sandbox.cc",
"linux-sandbox.h",
@@ -70,12 +70,12 @@
}),
linkopts = ["-lm"],
deps = select({
- "//src:darwin": [],
- "//src:darwin_x86_64": [],
- "//src:freebsd": [],
- "//src:windows": [],
- "//src:windows_msys": [],
- "//src:windows_msvc": [],
+ "//src/conditions:darwin": [],
+ "//src/conditions:darwin_x86_64": [],
+ "//src/conditions:freebsd": [],
+ "//src/conditions:windows": [],
+ "//src/conditions:windows_msys": [],
+ "//src/conditions:windows_msvc": [],
"//conditions:default": [
":logging",
":process-tools",
diff --git a/src/test/cpp/BUILD b/src/test/cpp/BUILD
index 50054ad..1f58e4d 100644
--- a/src/test/cpp/BUILD
+++ b/src/test/cpp/BUILD
@@ -11,14 +11,14 @@
cc_test(
name = "blaze_util_test",
srcs = select({
- "//src:windows": [
+ "//src/conditions:windows": [
"blaze_util_windows_test.cc",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
"blaze_util_test.cc",
"blaze_util_windows_test.cc",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
"blaze_util_windows_test.cc",
],
"//conditions:default": [
diff --git a/src/test/cpp/util/BUILD b/src/test/cpp/util/BUILD
index 791be74..91b1ef0 100644
--- a/src/test/cpp/util/BUILD
+++ b/src/test/cpp/util/BUILD
@@ -22,13 +22,13 @@
name = "file_test",
size = "small",
srcs = ["file_test.cc"] + select({
- "//src:windows": [
+ "//src/conditions:windows": [
"file_windows_test.cc",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
"file_windows_test.cc",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
"file_windows_test.cc",
],
"//conditions:default": [
@@ -40,15 +40,15 @@
"//src/main/cpp/util:file",
"//third_party:gtest",
] + select({
- "//src:windows": [
+ "//src/conditions:windows": [
":windows_test_util",
"//src/main/native/windows:lib-file",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
":windows_test_util",
"//src/main/native/windows:lib-file",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
":windows_test_util",
"//src/main/native/windows:lib-file",
],
@@ -90,15 +90,15 @@
name = "windows_test_util",
testonly = 1,
srcs = select({
- "//src:windows": ["windows_test_util.cc"],
- "//src:windows_msys": ["windows_test_util.cc"],
- "//src:windows_msvc": ["windows_test_util.cc"],
+ "//src/conditions:windows": ["windows_test_util.cc"],
+ "//src/conditions:windows_msys": ["windows_test_util.cc"],
+ "//src/conditions:windows_msvc": ["windows_test_util.cc"],
"//conditions:default": [],
}),
hdrs = select({
- "//src:windows": ["windows_test_util.h"],
- "//src:windows_msys": ["windows_test_util.h"],
- "//src:windows_msvc": ["windows_test_util.h"],
+ "//src/conditions:windows": ["windows_test_util.h"],
+ "//src/conditions:windows_msys": ["windows_test_util.h"],
+ "//src/conditions:windows_msvc": ["windows_test_util.h"],
"//conditions:default": [],
}),
visibility = [
@@ -111,21 +111,21 @@
name = "windows_test_util_test",
size = "small",
srcs = select({
- "//src:windows": ["windows_test_util_test.cc"],
- "//src:windows_msys": ["windows_test_util_test.cc"],
- "//src:windows_msvc": ["windows_test_util_test.cc"],
+ "//src/conditions:windows": ["windows_test_util_test.cc"],
+ "//src/conditions:windows_msys": ["windows_test_util_test.cc"],
+ "//src/conditions:windows_msvc": ["windows_test_util_test.cc"],
"//conditions:default": ["dummy_test.cc"],
}),
deps = select({
- "//src:windows": [
+ "//src/conditions:windows": [
":windows_test_util",
"//third_party:gtest",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
":windows_test_util",
"//third_party:gtest",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
":windows_test_util",
"//third_party:gtest",
],
diff --git a/src/test/java/com/google/devtools/build/android/junctions/BUILD b/src/test/java/com/google/devtools/build/android/junctions/BUILD
index f3e00a3..727dc02 100644
--- a/src/test/java/com/google/devtools/build/android/junctions/BUILD
+++ b/src/test/java/com/google/devtools/build/android/junctions/BUILD
@@ -14,15 +14,15 @@
name = "JunctionCreatorTest",
size = "small",
srcs = select({
- "//src:windows": ["WindowsJunctionCreatorTest.java"],
- "//src:windows_msvc": ["WindowsJunctionCreatorTest.java"],
- "//src:windows_msys": ["WindowsJunctionCreatorTest.java"],
+ "//src/conditions:windows": ["WindowsJunctionCreatorTest.java"],
+ "//src/conditions:windows_msvc": ["WindowsJunctionCreatorTest.java"],
+ "//src/conditions:windows_msys": ["WindowsJunctionCreatorTest.java"],
"//conditions:default": ["NoopJunctionCreatorTest.java"],
}),
test_class = select({
- "//src:windows": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
- "//src:windows_msvc": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
- "//src:windows_msys": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
+ "//src/conditions:windows": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
+ "//src/conditions:windows_msvc": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
+ "//src/conditions:windows_msys": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
"//conditions:default": "com.google.devtools.build.android.junctions.NoopJunctionCreatorTest",
}),
deps = [
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 4cb175a..c511698 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -22,9 +22,9 @@
ALL_WINDOWS_TESTS = CROSS_PLATFORM_WINDOWS_TESTS + WINDOWS_ON_WINDOWS_TESTS
JNI_LIB = select({
- "//src:windows": ["//src/main/native/windows:windows_jni.dll"],
- "//src:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
- "//src:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
"//conditions:default": [
"//src/main/native:libunix.dylib",
"//src/main/native:libunix.so",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
index ab29344..8c7437e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
@@ -13,9 +13,9 @@
java_test(
name = "RepositoryTests",
srcs = select({
- "//src:windows": [":RepositoryTests_windows_srcs"],
- "//src:windows_msys": [":RepositoryTests_windows_srcs"],
- "//src:windows_msvc": [":RepositoryTests_windows_srcs"],
+ "//src/conditions:windows": [":RepositoryTests_windows_srcs"],
+ "//src/conditions:windows_msys": [":RepositoryTests_windows_srcs"],
+ "//src/conditions:windows_msvc": [":RepositoryTests_windows_srcs"],
"//conditions:default": glob(["*.java"]),
}),
data = ["test_decompress_archive.tar.gz"],
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index 4fbd825..a92f871 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -50,8 +50,8 @@
java_test(
name = "SkyframeTests",
srcs = select({
- "//src:darwin": glob(["*.java"]),
- "//src:darwin_x86_64": glob(["*.java"]),
+ "//src/conditions:darwin": glob(["*.java"]),
+ "//src/conditions:darwin_x86_64": glob(["*.java"]),
"//conditions:default": glob(
["*.java"],
exclude = ["MacOSXFsEventsDiffAwarenessTest.java"],
diff --git a/src/test/native/BUILD b/src/test/native/BUILD
index 38bb992..3934fd5 100644
--- a/src/test/native/BUILD
+++ b/src/test/native/BUILD
@@ -12,32 +12,32 @@
name = "windows_jni_test",
size = "small",
srcs = select({
- "//src:windows": [
+ "//src/conditions:windows": [
"windows/util_test.cc",
"windows/file_test.cc",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
"windows/util_test.cc",
"windows/file_test.cc",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
"windows/util_test.cc",
"windows/file_test.cc",
],
"//conditions:default": ["dummy_test.cc"],
}),
deps = select({
- "//src:windows": [
+ "//src/conditions:windows": [
"//src/main/native/windows:lib-file",
"//src/test/cpp/util:windows_test_util",
"//third_party:gtest",
],
- "//src:windows_msys": [
+ "//src/conditions:windows_msys": [
"//src/main/native/windows:lib-file",
"//src/test/cpp/util:windows_test_util",
"//third_party:gtest",
],
- "//src:windows_msvc": [
+ "//src/conditions:windows_msvc": [
"//src/main/native/windows:lib-file",
"//src/test/cpp/util:windows_test_util",
"//third_party:gtest",
diff --git a/src/test/py/bazel/BUILD b/src/test/py/bazel/BUILD
index 98b20ca..47c63de 100644
--- a/src/test/py/bazel/BUILD
+++ b/src/test/py/bazel/BUILD
@@ -57,21 +57,21 @@
name = "bazel_windows_test",
size = "medium",
srcs = select({
- "//src:windows": ["bazel_windows_test.py"],
- "//src:windows_msvc": ["bazel_windows_test.py"],
- "//src:windows_msys": ["bazel_windows_test.py"],
+ "//src/conditions:windows": ["bazel_windows_test.py"],
+ "//src/conditions:windows_msvc": ["bazel_windows_test.py"],
+ "//src/conditions:windows_msys": ["bazel_windows_test.py"],
"//conditions:default": ["empty_test.py"],
}),
main = select({
- "//src:windows": "bazel_windows_test.py",
- "//src:windows_msvc": "bazel_windows_test.py",
- "//src:windows_msys": "bazel_windows_test.py",
+ "//src/conditions:windows": "bazel_windows_test.py",
+ "//src/conditions:windows_msvc": "bazel_windows_test.py",
+ "//src/conditions:windows_msys": "bazel_windows_test.py",
"//conditions:default": "empty_test.py",
}),
deps = select({
- "//src:windows": [":test_base"],
- "//src:windows_msvc": [":test_base"],
- "//src:windows_msys": [":test_base"],
+ "//src/conditions:windows": [":test_base"],
+ "//src/conditions:windows_msvc": [":test_base"],
+ "//src/conditions:windows_msys": [":test_base"],
"//conditions:default": [],
}),
)
@@ -87,21 +87,21 @@
name = "bazel_windows_cpp_test",
size = "large",
srcs = select({
- "//src:windows": ["bazel_windows_cpp_test.py"],
- "//src:windows_msvc": ["bazel_windows_cpp_test.py"],
- "//src:windows_msys": ["bazel_windows_cpp_test.py"],
+ "//src/conditions:windows": ["bazel_windows_cpp_test.py"],
+ "//src/conditions:windows_msvc": ["bazel_windows_cpp_test.py"],
+ "//src/conditions:windows_msys": ["bazel_windows_cpp_test.py"],
"//conditions:default": ["empty_test.py"],
}),
main = select({
- "//src:windows": "bazel_windows_cpp_test.py",
- "//src:windows_msvc": "bazel_windows_cpp_test.py",
- "//src:windows_msys": "bazel_windows_cpp_test.py",
+ "//src/conditions:windows": "bazel_windows_cpp_test.py",
+ "//src/conditions:windows_msvc": "bazel_windows_cpp_test.py",
+ "//src/conditions:windows_msys": "bazel_windows_cpp_test.py",
"//conditions:default": "empty_test.py",
}),
deps = select({
- "//src:windows": [":test_base"],
- "//src:windows_msvc": [":test_base"],
- "//src:windows_msys": [":test_base"],
+ "//src/conditions:windows": [":test_base"],
+ "//src/conditions:windows_msvc": [":test_base"],
+ "//src/conditions:windows_msys": [":test_base"],
"//conditions:default": [],
}),
)
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 855bba1..71b103e 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -47,9 +47,9 @@
] + select({
# TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/2241
# is resolved, use cc implementation of singlejar on windows
- "//src:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
- "//src:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
- "//src:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
+ "//src/conditions:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
+ "//src/conditions:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
+ "//src/conditions:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
"//conditions:default": ["//src/tools/singlejar:singlejar"],
}),
visibility = [
@@ -175,11 +175,11 @@
size = "medium",
srcs = ["bazel_toolchain_test.sh"],
data = [":test-deps"] + select({
- "//src:darwin": [],
- "//src:darwin_x86_64": [],
- "//src:windows": [],
- "//src:windows_msys": [],
- "//src:windows_msvc": [],
+ "//src/conditions:darwin": [],
+ "//src/conditions:darwin_x86_64": [],
+ "//src/conditions:windows": [],
+ "//src/conditions:windows_msys": [],
+ "//src/conditions:windows_msvc": [],
"//conditions:default": ["//src/test/shell/bazel/testdata:bazel_toolchain_test_project_pkg"],
}),
tags = [
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
index 26b66d2..784b778 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
@@ -8,8 +8,8 @@
java_binary(
name = "ResourceProcessorBusyBox",
data = select({
- "//src:windows": ["//src/main/native/windows:windows_jni.dll"],
- "//src:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
"//conditions:default": [],
}),
main_class = "com.google.devtools.build.android.ResourceProcessorBusyBox",
diff --git a/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD b/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD
index e03eda3..de671c2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD
@@ -30,9 +30,9 @@
name = "junctions",
srcs = glob(["*.java"]),
data = select({
- "//src:windows": ["//src/main/native/windows:windows_jni.dll"],
- "//src:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
- "//src:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
+ "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
"//conditions:default": [],
}),
visibility = [
diff --git a/src/tools/launcher/win_rules.bzl b/src/tools/launcher/win_rules.bzl
index ca30ebf..093d844 100644
--- a/src/tools/launcher/win_rules.bzl
+++ b/src/tools/launcher/win_rules.bzl
@@ -20,11 +20,11 @@
native.cc_library(
srcs = select({
"//conditions:default": ["dummy.cc"],
- "//src:windows": srcs,
+ "//src/conditions:windows": srcs,
}),
hdrs = select({
"//conditions:default": [],
- "//src:windows": hdrs,
+ "//src/conditions:windows": hdrs,
}),
**kwargs)
@@ -33,7 +33,7 @@
native.cc_binary(
srcs = select({
"//conditions:default": ["dummy.cc"],
- "//src:windows": srcs,
+ "//src/conditions:windows": srcs,
}),
**kwargs)
@@ -42,6 +42,6 @@
native.cc_test(
srcs = select({
"//conditions:default": ["dummy.cc"],
- "//src:windows": srcs,
+ "//src/conditions:windows": srcs,
}),
**kwargs)
diff --git a/src/tools/runfiles/BUILD b/src/tools/runfiles/BUILD
index 0cb40e0..a3993c0 100644
--- a/src/tools/runfiles/BUILD
+++ b/src/tools/runfiles/BUILD
@@ -20,9 +20,9 @@
sh_test(
name = "runfiles_sh_test",
srcs = select({
- "//src:windows": ["runfiles_windows_test.sh"],
- "//src:windows_msys": ["runfiles_windows_test.sh"],
- "//src:windows_msvc": ["runfiles_windows_test.sh"],
+ "//src/conditions:windows": ["runfiles_windows_test.sh"],
+ "//src/conditions:windows_msys": ["runfiles_windows_test.sh"],
+ "//src/conditions:windows_msvc": ["runfiles_windows_test.sh"],
"//conditions:default": ["runfiles_posix_test.sh"],
}),
deps = [":runfiles_sh_lib"],
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index 1b0cfd2..e7ff2ae 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -5,9 +5,9 @@
JAR_TOOL_PATH_COPT_TPL = "-DJAR_TOOL_PATH=\\\"external/local_jdk/bin/jar%s\\\""
JAR_TOOL_PATH_COPTS = select({
- "//src:windows": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
- "//src:windows_msvc": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
- "//src:windows_msys": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
+ "//src/conditions:windows": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
+ "//src/conditions:windows_msvc": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
+ "//src/conditions:windows_msys": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
"//conditions:default": [JAR_TOOL_PATH_COPT_TPL % ""],
})
@@ -46,7 +46,7 @@
"singlejar_main.cc",
],
linkopts = select({
- "//src:freebsd": ["-lm"],
+ "//src/conditions:freebsd": ["-lm"],
"//conditions:default": [],
}),
linkstatic = 1,
diff --git a/tools/android/BUILD b/tools/android/BUILD
index e5379e8..2144b0b 100644
--- a/tools/android/BUILD
+++ b/tools/android/BUILD
@@ -171,13 +171,13 @@
py_test(
name = "junction_test",
srcs = select({
- "//src:windows": ["junction_test.py"],
- "//src:windows_msvc": ["junction_test.py"],
+ "//src/conditions:windows": ["junction_test.py"],
+ "//src/conditions:windows_msvc": ["junction_test.py"],
"//conditions:default": ["dummy_test.py"],
}),
main = select({
- "//src:windows": "junction_test.py",
- "//src:windows_msvc": "junction_test.py",
+ "//src/conditions:windows": "junction_test.py",
+ "//src/conditions:windows_msvc": "junction_test.py",
"//conditions:default": "dummy_test.py",
}),
deps = [
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index 11501b9..1963206 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -66,8 +66,8 @@
java_import(
name = "singlejar_deploy",
jars = select({
- "//src:windows": ["@bazel_tools//tools/jdk:singlejar"],
- "//src:windows_msvc": ["@bazel_tools//tools/jdk:singlejar"],
+ "//src/conditions:windows": ["@bazel_tools//tools/jdk:singlejar"],
+ "//src/conditions:windows_msvc": ["@bazel_tools//tools/jdk:singlejar"],
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
@@ -77,8 +77,8 @@
name = "singlejar_javabin",
main_class = "com.google.devtools.build.singlejar.SingleJar",
runtime_deps = select({
- "//src:windows": [":singlejar_deploy"],
- "//src:windows_msvc": [":singlejar_deploy"],
+ "//src/conditions:windows": [":singlejar_deploy"],
+ "//src/conditions:windows_msvc": [":singlejar_deploy"],
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
@@ -107,14 +107,14 @@
"@local_jdk//:bootclasspath"
],
tools = select({
- "//src:windows": [":singlejar_javabin"],
- "//src:windows_msvc": [":singlejar_javabin"],
+ "//src/conditions:windows": [":singlejar_javabin"],
+ "//src/conditions:windows_msvc": [":singlejar_javabin"],
"//conditions:default": ["@bazel_tools//tools/jdk:singlejar"],
}),
outs = ["java_lang_extras.jar"],
cmd = select({
- "//src:windows": gen_java_lang_extras_jar_cmd % ":singlejar_javabin",
- "//src:windows_msvc": gen_java_lang_extras_jar_cmd % ":singlejar_javabin",
+ "//src/conditions:windows": gen_java_lang_extras_jar_cmd % ":singlejar_javabin",
+ "//src/conditions:windows_msvc": gen_java_lang_extras_jar_cmd % ":singlejar_javabin",
"//conditions:default": gen_java_lang_extras_jar_cmd % "@bazel_tools//tools/jdk:singlejar",
}),
visibility = ["//visibility:private"],
diff --git a/tools/def_parser/BUILD.tools b/tools/def_parser/BUILD.tools
index bd1b891..7dbfebb 100644
--- a/tools/def_parser/BUILD.tools
+++ b/tools/def_parser/BUILD.tools
@@ -3,9 +3,9 @@
filegroup(
name = "def_parser",
srcs = select({
- "//src:host_windows": ["def_parser.exe"],
- "//src:host_windows_msvc": ["def_parser.exe"],
- "//src:host_windows_msys": ["def_parser.exe"],
+ "//src/conditions:host_windows": ["def_parser.exe"],
+ "//src/conditions:host_windows_msvc": ["def_parser.exe"],
+ "//src/conditions:host_windows_msys": ["def_parser.exe"],
"//conditions:default": [
"no_op.bat",
],
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index fb24b3e..3889dd3 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -74,7 +74,7 @@
filegroup(
name = "ijar",
srcs = select({
- "//src:remote": ["//third_party/ijar:ijar"],
+ "//src/conditions:remote": ["//third_party/ijar:ijar"],
"//conditions:default": glob(["ijar/*"]),
}),
)
@@ -88,7 +88,7 @@
filegroup(
name = "singlejar",
srcs = select({
- "//src:remote": ["//src/tools/singlejar:singlejar"],
+ "//src/conditions:remote": ["//src/tools/singlejar:singlejar"],
"//conditions:default": glob(["singlejar/*"]),
}),
)
diff --git a/tools/launcher/BUILD.tools b/tools/launcher/BUILD.tools
index 960e0c5..20e0e0e 100644
--- a/tools/launcher/BUILD.tools
+++ b/tools/launcher/BUILD.tools
@@ -3,7 +3,7 @@
filegroup(
name = "launcher_windows",
srcs = select({
- "//src:remote": ["//src/tools/launcher:launcher"],
+ "//src/conditions:remote": ["//src/tools/launcher:launcher"],
"//conditions:default": ["launcher.exe"],
}),
)
@@ -11,9 +11,9 @@
filegroup(
name = "launcher",
srcs = select({
- "//src:host_windows": [":launcher_windows"],
- "//src:host_windows_msvc": [":launcher_windows"],
- "//src:host_windows_msys": [":launcher_windows"],
+ "//src/conditions:host_windows": [":launcher_windows"],
+ "//src/conditions:host_windows_msvc": [":launcher_windows"],
+ "//src/conditions:host_windows_msys": [":launcher_windows"],
"//conditions:default": [
"//src/tools/launcher:launcher",
],
diff --git a/tools/zip/BUILD.tools b/tools/zip/BUILD.tools
index 65335a0..ee34339 100644
--- a/tools/zip/BUILD.tools
+++ b/tools/zip/BUILD.tools
@@ -3,7 +3,7 @@
filegroup(
name = "zipper",
srcs = select({
- "//src:remote": ["//third_party/ijar:zipper"],
+ "//src/conditions:remote": ["//third_party/ijar:zipper"],
"//conditions:default": glob(["zipper/*"]),
}),
)
