Complete moving io.* to io_shaderc.*

Fixes google#1174
PojavLauncherTeam · Mar 16, 2021 · 3fe94c6 · 3fe94c6
1 parent ca84dca
commit 3fe94c6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -28,7 +28,7 @@ source_set("shaderc_util_sources") {
     "libshaderc_util/include/libshaderc_util/exceptions.h",
     "libshaderc_util/include/libshaderc_util/file_finder.h",
     "libshaderc_util/include/libshaderc_util/format.h",
-    "libshaderc_util/include/libshaderc_util/io.h",
+    "libshaderc_util/include/libshaderc_util/io_shaderc.h",
     "libshaderc_util/include/libshaderc_util/message.h",
     "libshaderc_util/include/libshaderc_util/mutex.h",
     "libshaderc_util/include/libshaderc_util/resources.h",
@@ -38,7 +38,7 @@ source_set("shaderc_util_sources") {
     "libshaderc_util/include/libshaderc_util/version_profile.h",
     "libshaderc_util/src/compiler.cc",
     "libshaderc_util/src/file_finder.cc",
-    "libshaderc_util/src/io.cc",
+    "libshaderc_util/src/io_shaderc.cc",
     "libshaderc_util/src/message.cc",
     "libshaderc_util/src/resources.cc",
     "libshaderc_util/src/shader_stage.cc",

diff --git a/libshaderc_util/Android.mk b/libshaderc_util/Android.mk
@@ -21,7 +21,7 @@ LOCAL_EXPORT_C_INCLUDES:=$(LOCAL_PATH)/include
 LOCAL_SRC_FILES:=src/args.cc \
                 src/compiler.cc \
 		src/file_finder.cc \
-		src/io.cc \
+		src/io_shaderc.cc \
 		src/message.cc \
 		src/resources.cc \
 		src/shader_stage.cc \

diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
@@ -29,7 +29,7 @@ add_library(shaderc_util STATIC
   src/args.cc
   src/compiler.cc
   src/file_finder.cc
-  src/io.cc
+  src/io_shaderc.cc
   src/message.cc
   src/resources.cc
   src/shader_stage.cc
@@ -57,7 +57,7 @@ shaderc_add_tests(
     string_piece
     format
     file_finder
-    io
+    io_shaderc
     message
     mutex
     version_profile)
@@ -85,5 +85,5 @@ add_custom_target(testdata COMMAND
 
 if(${SHADERC_ENABLE_TESTS})
   add_dependencies(shaderc_util_file_finder_test testdata)
-  add_dependencies(shaderc_util_io_test testdata)
+  add_dependencies(shaderc_util_io_shaderc_test testdata)
 endif()
diff --git a/libshaderc_util/src/io.cc → libshaderc_util/src/io_shaderc.cc b/libshaderc_util/src/io.cc → libshaderc_util/src/io_shaderc.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include <errno.h>
+
 #include <cstdio>
 #include <cstring>
 #include <fstream>
@@ -105,7 +106,7 @@ std::ostream* GetOutputStream(const string_piece& output_filename,
     stream = file_stream;
     if (file_stream->fail()) {
       *err << "glslc: error: cannot open output file: '" << output_filename
-                << "'";
+           << "'";
       if (access(output_filename.str().c_str(), W_OK) != 0) {
         OutputFileErrorMessage(errno);
         return nullptr;

diff --git a/libshaderc_util/src/io_test.cc → libshaderc_util/src/io_shaderc_test.cc b/libshaderc_util/src/io_test.cc → libshaderc_util/src/io_shaderc_test.cc
@@ -14,17 +14,17 @@
 
 #include "libshaderc_util/io_shaderc.h"
 
-#include <fstream>
-
 #include <gmock/gmock.h>
 
+#include <fstream>
+
 namespace {
 
+using shaderc_util::GetBaseFileName;
+using shaderc_util::GetOutputStream;
 using shaderc_util::IsAbsolutePath;
 using shaderc_util::ReadFile;
 using shaderc_util::WriteFile;
-using shaderc_util::GetOutputStream;
-using shaderc_util::GetBaseFileName;
 using testing::Eq;
 using testing::HasSubstr;
 
@@ -90,8 +90,7 @@ TEST(GetBaseFileName, Windows) {
 
 TEST_F(ReadFileTest, CorrectContent) {
   ASSERT_TRUE(ReadFile("include_file.1", &read_data));
-  EXPECT_EQ("The quick brown fox jumps over a lazy dog.",
-            ToString(read_data));
+  EXPECT_EQ("The quick brown fox jumps over a lazy dog.", ToString(read_data));
 }
 
 TEST_F(ReadFileTest, EmptyContent) {