Skip to content

Commit

Permalink
Run Buildifier on almost everything
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 379365359
  • Loading branch information
rupertks authored and copybara-github committed Jun 14, 2021
1 parent e7bd094 commit c0f0f8d
Show file tree
Hide file tree
Showing 26 changed files with 141 additions and 84 deletions.
2 changes: 1 addition & 1 deletion scripts/docs/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools/python:private/defs.bzl", "py_library", "py_binary")
load("//tools/python:private/defs.bzl", "py_binary", "py_library")

filegroup(
name = "srcs",
Expand Down
1 change: 0 additions & 1 deletion src/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ alias(
actual = "//src/conditions:windows_msvc",
visibility = ["//visibility:public"],
)

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cc_library(
name = 'cpufeatures',
srcs = glob(['ndk/sources/android/cpufeatures/*.c']),
hdrs = glob(['ndk/sources/android/cpufeatures/*.h']),
linkopts = ['-ldl'],
name = "cpufeatures",
srcs = glob(["ndk/sources/android/cpufeatures/*.c"]),
hdrs = glob(["ndk/sources/android/cpufeatures/*.h"]),
linkopts = ["-ldl"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ filegroup(
name = "%name%",
srcs = glob(["%fileGlobPattern%"]),
)

Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ load(":test_rule.bzl", "test_rule")
test_rule(
name = "test_generated_deps",
module_source = "@generated_node_modules//:example-module",
version = "0.2.0"
)
version = "0.2.0",
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
workspace(name = "fine_grained_user_modules",
managed_directories = {'@generated_node_modules': ['node_modules']})
workspace(
name = "fine_grained_user_modules",
managed_directories = {"@generated_node_modules": ["node_modules"]},
)

load(":use_node_modules.bzl", "generate_fine_grained_node_modules")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ my_rule = rule(
"t": attr.string_list_dict(mandatory = True, doc = "Some string_list_dict"),
"u": attr.string(),
"v": attr.label(),
"w": attr.int()
"w": attr.int(),
},
)
14 changes: 7 additions & 7 deletions src/test/py/bazel/testdata/runfiles_test/WORKSPACE.mock
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "foo_ws")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "rules_cc",
sha256 = "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
strip_prefix = "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
],
name = "rules_cc",
sha256 = "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
strip_prefix = "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
],
)
18 changes: 9 additions & 9 deletions src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ py_binary(
srcs = ["foo.py"],
data = [
"datadep/hello.txt",
"//bar:bar-cc",
"//bar:bar-java",
"//bar:bar-py",
"//bar:bar-sh",
"//bar:bar-cc",
],
main = "foo.py",
deps = ["@bazel_tools//tools/python/runfiles"],
Expand All @@ -17,10 +17,10 @@ java_binary(
srcs = ["Foo.java"],
data = [
"datadep/hello.txt",
"//bar:bar-py",
"//bar:bar-cc",
"//bar:bar-java",
"//bar:bar-py",
"//bar:bar-sh",
"//bar:bar-cc",
],
main_class = "Foo",
deps = ["@bazel_tools//tools/java/runfiles"],
Expand All @@ -31,27 +31,27 @@ sh_binary(
srcs = ["foo.sh"],
data = [
"datadep/hello.txt",
"//bar:bar-cc",
"//bar:bar-java",
"//bar:bar-py",
"//bar:bar-sh",
"//bar:bar-cc",
],
deps = ["@bazel_tools//tools/bash/runfiles"],
)

cc_binary(
name = "runfiles-cc",
srcs = ["foo.cc"],
copts = select({
"@bazel_tools//src/conditions:windows": ["/DIS_WINDOWS=1"],
"//conditions:default": [],
}),
data = [
"datadep/hello.txt",
"//bar:bar-cc",
"//bar:bar-java",
"//bar:bar-py",
"//bar:bar-sh",
"//bar:bar-cc",
],
copts = select({
"@bazel_tools//src/conditions:windows": ["/DIS_WINDOWS=1"],
"//conditions:default": [],
}),
deps = ["@bazel_tools//tools/cpp/runfiles"],
)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
java_binary(
name = "KeepScanner",
main_class = "com.google.devtools.build.android.desugar.scan.KeepScanner",
visibility = ["@bazel_tools//tools/android:__pkg__"],
runtime_deps = [
"//src/tools/android/java/com/google/devtools/build/android:all_android_tools",
],
visibility = ["@bazel_tools//tools/android:__pkg__"],
)
2 changes: 1 addition & 1 deletion tools/android/emulator/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ genrule(
name = "empty_snapshot_fs",
srcs = ["snapshots.img.zip"],
outs = ["snapshots.img"],
tools = ["@bazel_tools//tools/zip:zipper"],
cmd = "$(location @bazel_tools//tools/zip:zipper) x $< -d $(@D)",
tools = ["@bazel_tools//tools/zip:zipper"],
)

filegroup(
Expand Down
10 changes: 5 additions & 5 deletions tools/android/runtime_deps/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ genrule(
)

genrule(
name = "gen_version_txt",
outs = ["version.txt"],
stamp = True,
cmd = """
name = "gen_version_txt",
outs = ["version.txt"],
cmd = """
embed_label="$$(grep BUILD_EMBED_LABEL bazel-out/stable-status.txt | cut -d ' ' -f 2-)"
if [[ -z "$$embed_label" ]]; then
# this happens when building for tests
Expand All @@ -65,6 +64,7 @@ bazel_repo_commit $$bazel_repo_commit
built_with_bazel_version $$bazel_version
EOF
""",
stamp = True,
)

genrule(
Expand All @@ -77,10 +77,10 @@ genrule(
pkg_tar(
name = "android_tools",
srcs = [
":version.txt",
"BUILD",
"WORKSPACE",
":desugar_jdk_libs.jar",
":version.txt",
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker_deploy.jar",
"//src/tools/android/java/com/google/devtools/build/android:all_android_tools_deploy.jar",
],
Expand Down
2 changes: 1 addition & 1 deletion tools/build_rules/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ filegroup(
name = "bzl_srcs",
srcs = glob(["*.bzl"]),
visibility = ["//tools:__pkg__"],
)
)
2 changes: 1 addition & 1 deletion tools/cpp/BUILD.static.bsd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# This becomes the BUILD file for @local_config_cc// under FreeBSD and OpenBSD.

load(":cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_cc//cc:defs.bzl", "cc_toolchain_suite", "cc_toolchain", "cc_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_toolchain", "cc_toolchain_suite")

package(default_visibility = ["//visibility:public"])

Expand Down
12 changes: 6 additions & 6 deletions tools/def_parser/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package(default_visibility = ["//visibility:public"])
filegroup(
name = "def_parser_windows",
srcs = select({
"//src/conditions:remote": ["//third_party/def_parser:def_parser"],
"//conditions:default": ["def_parser.exe"],
"//src/conditions:remote": ["//third_party/def_parser:def_parser"],
"//conditions:default": ["def_parser.exe"],
}),
)

filegroup(
name = "def_parser",
srcs = select({
"//src/conditions:host_windows": ["def_parser_windows"],
"//conditions:default": [
"no_op.bat",
],
"//src/conditions:host_windows": ["def_parser_windows"],
"//conditions:default": [
"no_op.bat",
],
}),
)
14 changes: 11 additions & 3 deletions tools/distributions/debian/debian_cc.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,22 @@ cc_library(
# libprotoc-dev
cc_library(
name = "protoc_lib",
linkopts = ["-lprotoc", "-lpthread", "-lm"],
deps = [":protobuf"],
linkopts = [
"-lprotoc",
"-lpthread",
"-lm",
],
visibility = ["//visibility:public"],
deps = [":protobuf"],
)

# libgrpc++-dev
cc_library(
name = "grpc++_unsecure",
linkopts = ["-lgrpc++_unsecure", "-lgrpc_unsecure", "-lgpr"],
linkopts = [
"-lgrpc++_unsecure",
"-lgrpc_unsecure",
"-lgpr",
],
visibility = ["//visibility:public"],
)
3 changes: 2 additions & 1 deletion tools/distributions/debian/debian_java.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ filegroup(

# libjacoco-java - BEGIN
JACOCOVERSION = "0.8.6"

java_import(
name = "agent",
jars = ["org.jacoco.agent.jar"],
Expand Down Expand Up @@ -320,9 +321,9 @@ java_import(
filegroup(
name = "auto_value-jars",
srcs = [
"auto-common.jar",
"auto-value.jar",
"auto-value-annotations.jar",
"auto-common.jar",
"escapevelocity.jar",
"javapoet.jar",
],
Expand Down
2 changes: 1 addition & 1 deletion tools/jdk/BUILD.java_tools_prebuilt
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ filegroup(
":windows": ["java_tools/ijar/ijar.exe"],
"//conditions:default": ["java_tools/ijar/ijar"],
}),
)
)
5 changes: 4 additions & 1 deletion tools/jdk/jdk.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ filegroup(
#This folder holds security policies
filegroup(
name = "jdk-conf",
srcs = glob(["conf/**"], allow_empty = True),
srcs = glob(
["conf/**"],
allow_empty = True,
),
)

filegroup(
Expand Down
12 changes: 6 additions & 6 deletions tools/launcher/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package(default_visibility = ["//visibility:public"])
filegroup(
name = "launcher_windows",
srcs = select({
"//src/conditions:remote": ["//src/tools/launcher:launcher"],
"//conditions:default": ["launcher.exe"],
"//src/conditions:remote": ["//src/tools/launcher:launcher"],
"//conditions:default": ["launcher.exe"],
}),
)

filegroup(
name = "launcher",
srcs = select({
"//src/conditions:host_windows": [":launcher_windows"],
"//conditions:default": [
"//src/tools/launcher:launcher",
],
"//src/conditions:host_windows": [":launcher_windows"],
"//conditions:default": [
"//src/tools/launcher:launcher",
],
}),
)
70 changes: 56 additions & 14 deletions tools/osx/crosstool/BUILD.toolchains
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,62 @@ package(default_visibility = ["//visibility:public"])
# TODO(apple-rules): Rename osx constraint to macOS.
OSX_TOOLS_CONSTRAINTS = {
"armeabi-v7a": ["@platforms//cpu:arm"],
"darwin_arm64": ["@platforms//os:osx", "@platforms//cpu:aarch64"],
"darwin_arm64e": ["@platforms//os:osx", "@platforms//cpu:aarch64"],
"darwin_x86_64": ["@platforms//os:osx", "@platforms//cpu:x86_64"],
"ios_arm64": ["@platforms//os:ios", "@platforms//cpu:aarch64"],
"ios_arm64e": ["@platforms//os:ios", "@platforms//cpu:aarch64"],
"ios_armv7": ["@platforms//os:ios", "@platforms//cpu:arm"],
"ios_i386": ["@platforms//os:ios", "@platforms//cpu:x86_32"],
"ios_x86_64": ["@platforms//os:ios", "@platforms//cpu:x86_64"],
"tvos_arm64": ["@platforms//os:ios", "@platforms//cpu:aarch64"],
"tvos_x86_64": ["@platforms//os:ios", "@platforms//cpu:x86_64"],
"watchos_arm64_32": ["@platforms//os:ios", "@platforms//cpu:aarch64"],
"watchos_armv7k": ["@platforms//os:ios", "@platforms//cpu:arm"],
"watchos_i386": ["@platforms//os:ios", "@platforms//cpu:x86_32"],
"watchos_x86_64": ["@platforms//os:ios", "@platforms//cpu:x86_64"],
"darwin_arm64": [
"@platforms//os:osx",
"@platforms//cpu:aarch64",
],
"darwin_arm64e": [
"@platforms//os:osx",
"@platforms//cpu:aarch64",
],
"darwin_x86_64": [
"@platforms//os:osx",
"@platforms//cpu:x86_64",
],
"ios_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
],
"ios_arm64e": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
],
"ios_armv7": [
"@platforms//os:ios",
"@platforms//cpu:arm",
],
"ios_i386": [
"@platforms//os:ios",
"@platforms//cpu:x86_32",
],
"ios_x86_64": [
"@platforms//os:ios",
"@platforms//cpu:x86_64",
],
"tvos_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
],
"tvos_x86_64": [
"@platforms//os:ios",
"@platforms//cpu:x86_64",
],
"watchos_arm64_32": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
],
"watchos_armv7k": [
"@platforms//os:ios",
"@platforms//cpu:arm",
],
"watchos_i386": [
"@platforms//os:ios",
"@platforms//cpu:x86_32",
],
"watchos_x86_64": [
"@platforms//os:ios",
"@platforms//cpu:x86_64",
],
}

OSX_DEVELOPER_PLATFORM_CPUS = [
Expand Down
1 change: 0 additions & 1 deletion tools/platforms/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,3 @@ platform(
],
target_platform = True,
)

Loading

0 comments on commit c0f0f8d

Please sign in to comment.