From e1ce5733f2e0317b522d8c12966ce3f5f48527ac Mon Sep 17 00:00:00 2001 From: Xavier Bonaventura Date: Mon, 25 Apr 2022 20:24:37 +0200 Subject: [PATCH] Be explicit about alowing empty globs (second part) There are several globs that are empty and this prevents building with the incompatible flag #8195. This commit just makes it explicit that empty is allowed. --- .../build/lib/skyframe/packages/BazelPackageLoaderTest.java | 2 +- third_party/googleapis/BUILD.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java index 2236c2934caf17..ad4e0c299f98da 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java @@ -173,7 +173,7 @@ public void newLocalRepository() throws Exception { @Test public void buildDotBazelForSubpackageCheckDuringGlobbing() throws Exception { - file("a/BUILD", "filegroup(name = 'fg', srcs = glob(['sub/a.txt']))"); + file("a/BUILD", "filegroup(name = 'fg', srcs = glob(['sub/a.txt'], allow_empty = True))"); file("a/sub/a.txt"); file("a/sub/BUILD.bazel"); diff --git a/third_party/googleapis/BUILD.bazel b/third_party/googleapis/BUILD.bazel index 7f9496f67476f8..720ee4b5e7c80f 100644 --- a/third_party/googleapis/BUILD.bazel +++ b/third_party/googleapis/BUILD.bazel @@ -24,7 +24,7 @@ exports_files(["LICENSE"]) filegroup( name = "srcs", - srcs = glob(["**"]), + srcs = glob(["**"], allow_empty = True), visibility = ["@io_bazel//third_party:__pkg__"], )