Fold the windows/jni subpackage into its parent.
The WindowsJniLoader is now gone, so the windows/jni subpackage only contains
code that has some native calls. Users of these interfaces shouldn't have to
know if they depend on JNI or not given that this detail has no impact on how
the interfaces are used. So remove the subpackage for simplicity.
PiperOrigin-RevId: 335128918
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 93376b1..e8ba5d5 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -101,7 +101,6 @@
"//src/main/java/com/google/devtools/build/lib/versioning:srcs",
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs:srcs",
"//src/main/java/com/google/devtools/build/lib/vfs:srcs",
- "//src/main/java/com/google/devtools/build/lib/windows/jni:srcs",
"//src/main/java/com/google/devtools/build/lib/windows:srcs",
"//src/main/java/com/google/devtools/build/lib/worker:srcs",
"//src/main/java/com/google/devtools/build/skyframe:srcs",
diff --git a/src/main/java/com/google/devtools/build/lib/util/BUILD b/src/main/java/com/google/devtools/build/lib/util/BUILD
index 4e292fa..b7a8dc7 100644
--- a/src/main/java/com/google/devtools/build/lib/util/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/util/BUILD
@@ -46,7 +46,7 @@
":os",
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/unix",
- "//src/main/java/com/google/devtools/build/lib/windows/jni:processes",
+ "//src/main/java/com/google/devtools/build/lib/windows:processes",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/util/ProcessUtils.java b/src/main/java/com/google/devtools/build/lib/util/ProcessUtils.java
index 964e019..fc1cb2f 100644
--- a/src/main/java/com/google/devtools/build/lib/util/ProcessUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/util/ProcessUtils.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.util;
import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
-import com.google.devtools.build.lib.windows.jni.WindowsProcesses;
+import com.google.devtools.build.lib.windows.WindowsProcesses;
/**
* OS Process related utilities.
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/BUILD b/src/main/java/com/google/devtools/build/lib/vfs/BUILD
index 70a2769..ce71f23 100644
--- a/src/main/java/com/google/devtools/build/lib/vfs/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/vfs/BUILD
@@ -29,8 +29,8 @@
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
"//src/main/java/com/google/devtools/build/lib/util:filetype",
"//src/main/java/com/google/devtools/build/lib/util:os",
+ "//src/main/java/com/google/devtools/build/lib/windows:file",
"//src/main/java/com/google/devtools/build/lib/windows:windows_short_path",
- "//src/main/java/com/google/devtools/build/lib/windows/jni",
"//third_party:guava",
"//third_party:jsr305",
"//third_party/protobuf:protobuf_java",
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/WindowsOsPathPolicy.java b/src/main/java/com/google/devtools/build/lib/vfs/WindowsOsPathPolicy.java
index f420683..2bc730c 100644
--- a/src/main/java/com/google/devtools/build/lib/vfs/WindowsOsPathPolicy.java
+++ b/src/main/java/com/google/devtools/build/lib/vfs/WindowsOsPathPolicy.java
@@ -16,8 +16,8 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
+import com.google.devtools.build.lib.windows.WindowsFileOperations;
import com.google.devtools.build.lib.windows.WindowsShortPath;
-import com.google.devtools.build.lib.windows.jni.WindowsFileOperations;
import java.io.IOException;
@VisibleForTesting
diff --git a/src/main/java/com/google/devtools/build/lib/windows/BUILD b/src/main/java/com/google/devtools/build/lib/windows/BUILD
index 9f8c3e1..594d8fd 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/windows/BUILD
@@ -10,9 +10,20 @@
)
java_library(
+ name = "file",
+ srcs = ["WindowsFileOperations.java"],
+ deps = ["//src/main/java/com/google/devtools/build/lib/jni"],
+)
+
+java_library(
+ name = "processes",
+ srcs = ["WindowsProcesses.java"],
+ deps = ["//src/main/java/com/google/devtools/build/lib/jni"],
+)
+
+java_library(
name = "windows_short_path",
srcs = ["WindowsShortPath.java"],
- deps = ["//src/main/java/com/google/devtools/build/lib/windows/jni"],
)
java_library(
@@ -23,12 +34,13 @@
"WindowsSubprocessFactory.java",
],
deps = [
+ ":file",
+ ":processes",
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/profiler",
"//src/main/java/com/google/devtools/build/lib/shell",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
- "//src/main/java/com/google/devtools/build/lib/windows/jni",
"//third_party:guava",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsFileOperations.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsFileOperations.java
similarity index 99%
rename from src/main/java/com/google/devtools/build/lib/windows/jni/WindowsFileOperations.java
rename to src/main/java/com/google/devtools/build/lib/windows/WindowsFileOperations.java
index d652657..25cba40 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsFileOperations.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsFileOperations.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.windows.jni;
+package com.google.devtools.build.lib.windows;
import com.google.devtools.build.lib.jni.JniLoader;
import java.io.IOException;
diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsFileSystem.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsFileSystem.java
index e60bd5e..2d7b5b5 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsFileSystem.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsFileSystem.java
@@ -22,7 +22,6 @@
import com.google.devtools.build.lib.vfs.JavaIoFileSystem;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.devtools.build.lib.windows.jni.WindowsFileOperations;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsProcesses.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java
similarity index 98%
rename from src/main/java/com/google/devtools/build/lib/windows/jni/WindowsProcesses.java
rename to src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java
index 1acce15..531edf5 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsProcesses.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.build.lib.windows.jni;
+package com.google.devtools.build.lib.windows;
import com.google.devtools.build.lib.jni.JniLoader;
diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java
index dd03c74..69b8d35 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java
@@ -16,7 +16,6 @@
import com.google.common.base.Throwables;
import com.google.devtools.build.lib.shell.Subprocess;
-import com.google.devtools.build.lib.windows.jni.WindowsProcesses;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
index 4e3a91a..a2b58f1 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
@@ -20,7 +20,6 @@
import com.google.devtools.build.lib.shell.SubprocessBuilder.StreamAction;
import com.google.devtools.build.lib.shell.SubprocessFactory;
import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.devtools.build.lib.windows.jni.WindowsProcesses;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD b/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD
deleted file mode 100644
index ec0dd43..0000000
--- a/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
-package(default_visibility = ["//src:__subpackages__"])
-
-filegroup(
- name = "srcs",
- testonly = 0,
- srcs = glob(["**"]),
- visibility = ["//src:__subpackages__"],
-)
-
-package_group(
- name = "android-junctions-prod",
- packages = [
- "//src/tools/android/java/com/google/devtools/build/android/junctions",
- ],
-)
-
-package_group(
- name = "bazel-prod",
- packages = [
- "//src/main/java/com/google/devtools/build/lib/...",
- ],
-)
-
-package_group(
- name = "bazel-tests",
- packages = [
- "//src/test/java/com/google/devtools/build/lib/...",
- ],
-)
-
-java_library(
- name = "jni",
- exports = [
- ":file",
- ":processes",
- ],
-)
-
-java_library(
- name = "file",
- srcs = ["WindowsFileOperations.java"],
- deps = ["//src/main/java/com/google/devtools/build/lib/jni"],
-)
-
-java_library(
- name = "processes",
- srcs = ["WindowsProcesses.java"],
- deps = ["//src/main/java/com/google/devtools/build/lib/jni"],
-)
diff --git a/src/main/native/windows/file-jni.cc b/src/main/native/windows/file-jni.cc
index d06f42a..d920b08 100644
--- a/src/main/native/windows/file-jni.cc
+++ b/src/main/native/windows/file-jni.cc
@@ -40,7 +40,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsFileOperations_nativeIsSymlinkOrJunction(
+Java_com_google_devtools_build_lib_windows_WindowsFileOperations_nativeIsSymlinkOrJunction(
JNIEnv* env, jclass clazz, jstring path, jbooleanArray result_holder,
jobjectArray error_msg_holder) {
std::wstring wpath(bazel::windows::GetJavaWstring(env, path));
@@ -63,7 +63,7 @@
}
extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsFileOperations_nativeGetLongPath(
+Java_com_google_devtools_build_lib_windows_WindowsFileOperations_nativeGetLongPath(
JNIEnv* env, jclass clazz, jstring path, jobjectArray result_holder,
jobjectArray error_msg_holder) {
std::unique_ptr<WCHAR[]> result;
@@ -86,7 +86,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsFileOperations_nativeCreateJunction(
+Java_com_google_devtools_build_lib_windows_WindowsFileOperations_nativeCreateJunction(
JNIEnv* env, jclass clazz, jstring name, jstring target,
jobjectArray error_msg_holder) {
std::wstring wname(bazel::windows::GetJavaWstring(env, name));
@@ -104,7 +104,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsFileOperations_nativeCreateSymlink(
+Java_com_google_devtools_build_lib_windows_WindowsFileOperations_nativeCreateSymlink(
JNIEnv* env, jclass clazz, jstring name, jstring target,
jobjectArray error_msg_holder) {
std::wstring wname(bazel::windows::GetJavaWstring(env, name));
@@ -122,7 +122,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsFileOperations_nativeReadSymlinkOrJunction(
+Java_com_google_devtools_build_lib_windows_WindowsFileOperations_nativeReadSymlinkOrJunction(
JNIEnv* env, jclass clazz, jstring name, jobjectArray target_holder,
jobjectArray error_msg_holder) {
std::wstring wname(bazel::windows::GetJavaWstring(env, name));
@@ -145,7 +145,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsFileOperations_nativeDeletePath(
+Java_com_google_devtools_build_lib_windows_WindowsFileOperations_nativeDeletePath(
JNIEnv* env, jclass clazz, jstring path, jobjectArray error_msg_holder) {
std::wstring wpath(bazel::windows::GetJavaWstring(env, path));
std::wstring error;
diff --git a/src/main/native/windows/processes-jni.cc b/src/main/native/windows/processes-jni.cc
index 00d068d..ee0166a 100644
--- a/src/main/native/windows/processes-jni.cc
+++ b/src/main/native/windows/processes-jni.cc
@@ -41,7 +41,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_getpid(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_getpid(
JNIEnv* env, jclass clazz) {
return GetCurrentProcessId();
}
@@ -396,7 +396,7 @@
static jlong PtrAsJlong(void* p) { return reinterpret_cast<jlong>(p); }
extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_createProcess(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_createProcess(
JNIEnv* env, jclass clazz, jstring java_argv0, jstring java_argv_rest,
jbyteArray java_env, jstring java_cwd, jstring java_stdout_redirect,
jstring java_stderr_redirect, jboolean redirectErrorStream) {
@@ -413,7 +413,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_writeStdin(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_writeStdin(
JNIEnv* env, jclass clazz, jlong process_long, jbyteArray java_bytes,
jint offset, jint length) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
@@ -421,21 +421,21 @@
}
extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_getStdout(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_getStdout(
JNIEnv* env, jclass clazz, jlong process_long) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
return PtrAsJlong(process->GetStdoutStream());
}
extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_getStderr(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_getStderr(
JNIEnv* env, jclass clazz, jlong process_long) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
return PtrAsJlong(process->GetStderrStream());
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_readStream(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_readStream(
JNIEnv* env, jclass clazz, jlong stream_long, jbyteArray java_bytes,
jint offset, jint length) {
NativeOutputStream* stream =
@@ -444,7 +444,7 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_getExitCode(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_getExitCode(
JNIEnv* env, jclass clazz, jlong process_long) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
return static_cast<jint>(process->GetExitCode());
@@ -455,7 +455,7 @@
// 1: Timeout
// 2: Wait returned with an error
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_waitFor(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_waitFor(
JNIEnv* env, jclass clazz, jlong process_long, jlong java_timeout) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
int res = process->WaitFor(static_cast<int64_t>(java_timeout));
@@ -464,27 +464,27 @@
}
extern "C" JNIEXPORT jint JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_getProcessPid(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_getProcessPid(
JNIEnv* env, jclass clazz, jlong process_long) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
return static_cast<jint>(process->GetPid());
}
extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_terminate(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_terminate(
JNIEnv* env, jclass clazz, jlong process_long) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
return process->Terminate() ? JNI_TRUE : JNI_FALSE;
}
extern "C" JNIEXPORT void JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_deleteProcess(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_deleteProcess(
JNIEnv* env, jclass clazz, jlong process_long) {
delete reinterpret_cast<NativeProcess*>(process_long);
}
extern "C" JNIEXPORT void JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_closeStream(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_closeStream(
JNIEnv* env, jclass clazz, jlong stream_long) {
NativeOutputStream* stream =
reinterpret_cast<NativeOutputStream*>(stream_long);
@@ -492,14 +492,14 @@
}
extern "C" JNIEXPORT jstring JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_processGetLastError(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_processGetLastError(
JNIEnv* env, jclass clazz, jlong process_long) {
NativeProcess* process = reinterpret_cast<NativeProcess*>(process_long);
return process->GetLastErrorAsString(env);
}
extern "C" JNIEXPORT jstring JNICALL
-Java_com_google_devtools_build_lib_windows_jni_WindowsProcesses_streamGetLastError(
+Java_com_google_devtools_build_lib_windows_WindowsProcesses_streamGetLastError(
JNIEnv* env, jclass clazz, jlong stream_long) {
NativeOutputStream* stream =
reinterpret_cast<NativeOutputStream*>(stream_long);
diff --git a/src/test/java/com/google/devtools/build/lib/windows/BUILD b/src/test/java/com/google/devtools/build/lib/windows/BUILD
index 867c4ff..785cb7b 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/windows/BUILD
@@ -38,8 +38,9 @@
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/build/lib/windows",
+ "//src/main/java/com/google/devtools/build/lib/windows:file",
+ "//src/main/java/com/google/devtools/build/lib/windows:processes",
"//src/main/java/com/google/devtools/build/lib/windows:windows_short_path",
- "//src/main/java/com/google/devtools/build/lib/windows/jni",
"//src/test/java/com/google/devtools/build/lib/testutil",
"//src/test/java/com/google/devtools/build/lib/windows/util",
"//third_party:guava",
diff --git a/src/test/java/com/google/devtools/build/lib/windows/WindowsFileOperationsTest.java b/src/test/java/com/google/devtools/build/lib/windows/WindowsFileOperationsTest.java
index 7dac094..e7fa523 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/WindowsFileOperationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/windows/WindowsFileOperationsTest.java
@@ -20,7 +20,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.testutil.TestSpec;
import com.google.devtools.build.lib.util.OS;
-import com.google.devtools.build.lib.windows.jni.WindowsFileOperations;
import com.google.devtools.build.lib.windows.util.WindowsTestUtil;
import java.io.File;
import java.io.IOException;
diff --git a/src/test/java/com/google/devtools/build/lib/windows/WindowsProcessesTest.java b/src/test/java/com/google/devtools/build/lib/windows/WindowsProcessesTest.java
index 8910eca..20596bc 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/WindowsProcessesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/windows/WindowsProcessesTest.java
@@ -22,7 +22,6 @@
import com.google.devtools.build.lib.shell.ShellUtils;
import com.google.devtools.build.lib.testutil.TestSpec;
import com.google.devtools.build.lib.util.OS;
-import com.google.devtools.build.lib.windows.jni.WindowsProcesses;
import com.google.devtools.build.runfiles.Runfiles;
import java.io.File;
import java.nio.file.Files;
diff --git a/src/test/java/com/google/devtools/build/lib/windows/util/BUILD b/src/test/java/com/google/devtools/build/lib/windows/util/BUILD
index eb3cda1..1a3684a 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/util/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/windows/util/BUILD
@@ -20,7 +20,7 @@
],
deps = [
"//src/main/java/com/google/devtools/build/lib/vfs",
- "//src/main/java/com/google/devtools/build/lib/windows/jni",
+ "//src/main/java/com/google/devtools/build/lib/windows:file",
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java b/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java
index b054f85..5b03f71 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java
@@ -21,7 +21,7 @@
import com.google.common.base.Strings;
import com.google.devtools.build.lib.vfs.FileSystem;
import com.google.devtools.build.lib.vfs.Path;
-import com.google.devtools.build.lib.windows.jni.WindowsFileOperations;
+import com.google.devtools.build.lib.windows.WindowsFileOperations;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
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 272204f..13331c6 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
@@ -36,7 +36,7 @@
":android-tests",
],
deps = [
- "//src/main/java/com/google/devtools/build/lib/windows/jni:file",
+ "//src/main/java/com/google/devtools/build/lib/windows:file",
"//third_party:guava",
"//third_party:jsr305",
],
diff --git a/src/tools/android/java/com/google/devtools/build/android/junctions/WindowsJunctionCreator.java b/src/tools/android/java/com/google/devtools/build/android/junctions/WindowsJunctionCreator.java
index 3119fd3..01185c4 100644
--- a/src/tools/android/java/com/google/devtools/build/android/junctions/WindowsJunctionCreator.java
+++ b/src/tools/android/java/com/google/devtools/build/android/junctions/WindowsJunctionCreator.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.android.junctions;
import com.google.common.base.Preconditions;
-import com.google.devtools.build.lib.windows.jni.WindowsFileOperations;
+import com.google.devtools.build.lib.windows.WindowsFileOperations;
import java.io.IOException;
import java.nio.file.Path;
import java.util.LinkedHashMap;
