diff options
author | 2017-11-30 15:08:40 -0800 | |
---|---|---|
committer | 2017-11-30 15:10:20 -0800 | |
commit | 1a483d42df5bb42bcdc1f5f19662bcd1debd399d (patch) | |
tree | 8db9836b693464b9093359a5cf2d632aece8f0e8 /src/tools | |
parent | b2d82018906b15cf979ea74444c55d828a5b6ca7 (diff) |
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
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/BUILD.tools | 4 | ||||
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/junctions/BUILD | 6 | ||||
-rw-r--r-- | src/tools/launcher/win_rules.bzl | 8 | ||||
-rw-r--r-- | src/tools/runfiles/BUILD | 6 | ||||
-rw-r--r-- | src/tools/singlejar/BUILD | 8 |
5 files changed, 16 insertions, 16 deletions
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 26b66d2496..784b778d54 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_import( 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 e03eda3acd..de671c20b1 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 @@ java_library( 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 ca30ebfd08..093d8448eb 100644 --- a/src/tools/launcher/win_rules.bzl +++ b/src/tools/launcher/win_rules.bzl @@ -20,11 +20,11 @@ def cc_library(srcs=[], hdrs=[], **kwargs): 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 @@ def cc_binary(srcs=[], **kwargs): native.cc_binary( srcs = select({ "//conditions:default": ["dummy.cc"], - "//src:windows": srcs, + "//src/conditions:windows": srcs, }), **kwargs) @@ -42,6 +42,6 @@ def cc_test(srcs=[], **kwargs): 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 0cb40e04dd..a3993c0420 100644 --- a/src/tools/runfiles/BUILD +++ b/src/tools/runfiles/BUILD @@ -20,9 +20,9 @@ sh_library( 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 1b0cfd2444..e7ff2ae6c4 100644 --- a/src/tools/singlejar/BUILD +++ b/src/tools/singlejar/BUILD @@ -5,9 +5,9 @@ package(default_visibility = ["//src:__subpackages__"]) 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 @@ cc_binary( "singlejar_main.cc", ], linkopts = select({ - "//src:freebsd": ["-lm"], + "//src/conditions:freebsd": ["-lm"], "//conditions:default": [], }), linkstatic = 1, |