Windows, JNI: move around sources

Move the Windows JNI C++ sources to a separate
package and separate namespace.

This no-op refactoring allows other build rules
than Bazel's client library to depend on file I/O
and/or JNI functionality.

A follow-up commit will split the
//src/main/native/windows:processes library into
:jni-processes and :jni-file.

Change-Id: I33c5f8ebd8961cc440db3b4a95ff78024d7c1d74
PiperOrigin-RevId: 160404298

3 files changed, 19 insertions, 15 deletions

diff --git a/src/test/native/BUILD b/src/test/native/BUILD
index 4dd916fa8b..cd22785004 100644
--- a/src/test/native/BUILD
+++ b/src/test/native/BUILD
@@ -13,32 +13,32 @@ cc_test(
     size = "small",
     srcs = select({
         "//src:windows": [
-            "windows_util_test.cc",
-            "windows_file_operations_test.cc",
+            "windows/util_test.cc",
+            "windows/file_test.cc",
         ],
         "//src:windows_msys": [
-            "windows_util_test.cc",
-            "windows_file_operations_test.cc",
+            "windows/util_test.cc",
+            "windows/file_test.cc",
         ],
         "//src:windows_msvc": [
-            "windows_util_test.cc",
-            "windows_file_operations_test.cc",
+            "windows/util_test.cc",
+            "windows/file_test.cc",
         ],
         "//conditions:default": ["dummy_test.cc"],
     }),
     deps = select({
         "//src:windows": [
-            "//src/main/native:windows_jni_lib",
+            "//src/main/native/windows:lib-file",
             "//src/test/cpp/util:windows_test_util",
             "//third_party:gtest",
         ],
         "//src:windows_msys": [
-            "//src/main/native:windows_jni_lib",
+            "//src/main/native/windows:lib-file",
             "//src/test/cpp/util:windows_test_util",
             "//third_party:gtest",
         ],
         "//src:windows_msvc": [
-            "//src/main/native:windows_jni_lib",
+            "//src/main/native/windows:lib-file",
             "//src/test/cpp/util:windows_test_util",
             "//third_party:gtest",
         ],
diff --git a/src/test/native/windows_file_operations_test.cc b/src/test/native/windows/file_test.cc
index f3258a9a86..043d4df880 100644
--- a/src/test/native/windows_file_operations_test.cc
+++ b/src/test/native/windows/file_test.cc
@@ -20,14 +20,15 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "src/main/native/windows_file_operations.h"
+#include "src/main/native/windows/file.h"
 #include "src/test/cpp/util/windows_test_util.h"
 
 #if !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
 #error("This test should only be run on Windows")
 #endif  // !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
 
-namespace windows_util {
+namespace bazel {
+namespace windows {
 
 using blaze_util::DeleteAllUnder;
 using blaze_util::GetTestTmpDirW;
@@ -108,4 +109,5 @@ TEST_F(WindowsFileOperationsTest, TestCreateJunction) {
             ::GetFileAttributesW((name + L"4\\bar").c_str()));
 }
 
-}  // namespace windows_util
+}  // namespace windows
+}  // namespace bazel
diff --git a/src/test/native/windows_util_test.cc b/src/test/native/windows/util_test.cc
index 9e4b7cccd6..8cbb15a053 100644
--- a/src/test/native/windows_util_test.cc
+++ b/src/test/native/windows/util_test.cc
@@ -20,14 +20,15 @@
 #include <memory>      // unique_ptr
 #include <string>
 
-#include "src/main/native/windows_util.h"
 #include "gtest/gtest.h"
+#include "src/main/native/windows/util.h"
 
 #if !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
 #error("This test should only be run on Windows")
 #endif  // !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
 
-namespace windows_util {
+namespace bazel {
+namespace windows {
 
 using std::function;
 using std::string;
@@ -363,4 +364,5 @@ TEST(WindowsUtilTest, TestAsExecutablePathForCreateProcessConversions) {
   DeleteDirsUnder(tmpdir, short_root);
 }
 
-}  // namespace windows_util
+}  // namespace windows
+}  // namespace bazel