Skip to content

Commit 6d6bbdc

Browse files
coeuvrecopybara-github
authored andcommitted
Move BazelFileSystemModule into bazel package
Currently, it is included in runtime library with glob which is shared between bazel and blaze. Moving it to bazel package to prevent from packaging it when building blaze. An upcoming change (in #18784) will package BLAKE3 to this module and we don't want it in blaze. PiperOrigin-RevId: 547516042 Change-Id: I673fa3d6824d56c85e85b02d13b4eb56571edda9
1 parent 50a1afb commit 6d6bbdc

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

src/main/java/com/google/devtools/build/lib/bazel/BUILD

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,30 @@ java_library(
145145
],
146146
)
147147

148+
java_library(
149+
name = "bazel_filesystem_module",
150+
srcs = ["BazelFileSystemModule.java"],
151+
deps = [
152+
"//src/main/java/com/google/devtools/build/lib:runtime",
153+
"//src/main/java/com/google/devtools/build/lib/jni",
154+
"//src/main/java/com/google/devtools/build/lib/unix",
155+
"//src/main/java/com/google/devtools/build/lib/util:abrupt_exit_exception",
156+
"//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code",
157+
"//src/main/java/com/google/devtools/build/lib/util:os",
158+
"//src/main/java/com/google/devtools/build/lib/vfs",
159+
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
160+
"//src/main/java/com/google/devtools/build/lib/windows",
161+
"//src/main/java/com/google/devtools/common/options",
162+
"//src/main/protobuf:failure_details_java_proto",
163+
"//third_party:guava",
164+
],
165+
)
166+
148167
java_library(
149168
name = "main",
150169
srcs = ["Bazel.java"],
151170
deps = [
171+
":bazel_filesystem_module",
152172
":builtin_command_module",
153173
":modules",
154174
":repository_module",

src/main/java/com/google/devtools/build/lib/bazel/Bazel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class Bazel {
4949
com.google.devtools.build.lib.runtime.MemoryPressureModule.class,
5050
com.google.devtools.build.lib.platform.SleepPreventionModule.class,
5151
com.google.devtools.build.lib.platform.SystemSuspensionModule.class,
52-
com.google.devtools.build.lib.runtime.BazelFileSystemModule.class,
52+
BazelFileSystemModule.class,
5353
com.google.devtools.build.lib.runtime.mobileinstall.MobileInstallModule.class,
5454
com.google.devtools.build.lib.bazel.BazelWorkspaceStatusModule.class,
5555
com.google.devtools.build.lib.bazel.BazelDiffAwarenessModule.class,

src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java renamed to src/main/java/com/google/devtools/build/lib/bazel/BazelFileSystemModule.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
package com.google.devtools.build.lib.runtime;
14+
package com.google.devtools.build.lib.bazel;
1515

1616
import static com.google.common.base.Preconditions.checkNotNull;
1717

1818
import com.google.common.base.Strings;
1919
import com.google.devtools.build.lib.jni.JniLoader;
20+
import com.google.devtools.build.lib.runtime.BlazeModule;
21+
import com.google.devtools.build.lib.runtime.BlazeServerStartupOptions;
2022
import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
2123
import com.google.devtools.build.lib.server.FailureDetails.Filesystem;
2224
import com.google.devtools.build.lib.server.FailureDetails.Filesystem.Code;

0 commit comments

Comments
 (0)