From 5efe4a116027ae45edd4b8b5eb6ba58670b77f0f Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Tue, 14 Feb 2017 10:16:23 +0000 Subject: Windows JNI, refactor: move OpenDirectory to JNI Move the OpenDirectory helper method into the JNI library. We'll need it there; a subsequent change will make use of it there. See https://github.com/bazelbuild/bazel/issues/2107 -- PiperOrigin-RevId: 147448792 MOS_MIGRATED_REVID=147448792 --- src/test/cpp/util/BUILD | 10 ++-------- src/test/cpp/util/file_windows_test.cc | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src/test/cpp/util') diff --git a/src/test/cpp/util/BUILD b/src/test/cpp/util/BUILD index 64e9e19518..c8b2f57caf 100644 --- a/src/test/cpp/util/BUILD +++ b/src/test/cpp/util/BUILD @@ -38,14 +38,8 @@ cc_test( "//src/main/cpp/util:file", "//third_party:gtest", ] + select({ - "//src:windows": [ - "//src/main/native:windows_jni_lib", - ":windows_test_util", - ], - "//src:windows_msvc": [ - "//src/main/native:windows_jni_lib", - ":windows_test_util", - ], + "//src:windows": [":windows_test_util"], + "//src:windows_msvc": [":windows_test_util"], "//conditions:default": [], }), ) diff --git a/src/test/cpp/util/file_windows_test.cc b/src/test/cpp/util/file_windows_test.cc index 0e777d88fd..ec4e0f5b53 100644 --- a/src/test/cpp/util/file_windows_test.cc +++ b/src/test/cpp/util/file_windows_test.cc @@ -22,7 +22,6 @@ #include "gtest/gtest.h" #include "src/main/cpp/util/file.h" #include "src/main/cpp/util/file_platform.h" -#include "src/main/native/windows_util.h" #include "src/test/cpp/util/windows_test_util.h" #if !defined(COMPILER_MSVC) && !defined(__CYGWIN__) -- cgit v1.2.3