commit 4d7976635cfb835004dd6ba1933f9faca69c93ad
author Bob Beck <bbe@google.com> Thu Aug 24 21:54:39 2023 +0000
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 24 22:25:14 2023 +0000
tree 0bf12dfe13e4c755bd9f79d676c2fa6f0ce49de9
parent add6ffb02826087230c2e756c39779bed0f5e345

rename fillins/string_util.h because gn is special

Change-Id: I18ba860d28dd3fb55cc14904758d6a8dc95e3f89
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62725
Auto-Submit: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

pki/fillins/fillins_string_util.cc

diff --git a/pki/fillins/string_util.cc b/pki/fillins/fillins_string_util.cc
similarity index 98%
rename from pki/fillins/string_util.cc
rename to pki/fillins/fillins_string_util.cc
index aa2986d..cdafcc5 100644
--- a/pki/fillins/string_util.cc
+++ b/pki/fillins/fillins_string_util.cc
@@ -5,7 +5,7 @@
 #include "../string_util.h"
 #include <string>
 #include <string_view>
-#include "string_util.h"
+#include "fillins_string_util.h"
 
 
 namespace bssl {

pki/fillins/fillins_string_util.h

diff --git a/pki/fillins/string_util.h b/pki/fillins/fillins_string_util.h
similarity index 100%
rename from pki/fillins/string_util.h
rename to pki/fillins/fillins_string_util.h

pki/import_spec.json

diff --git a/pki/import_spec.json b/pki/import_spec.json
index f33dd0b..129f9fa 100644
--- a/pki/import_spec.json
+++ b/pki/import_spec.json
@@ -35,7 +35,7 @@
     {"match": "^#include \"net/base/net_export.h\"",
      "replace": ""},
     {"match": "^#include \"base/strings/string_util.h\"",
-     "replace": "#include \"fillins/string_util.h\""},
+     "replace": "#include \"fillins/fillins_string_util.h\""},
     {"match": "^#include \"base/base_paths.h\"",
      "replace": "#include \"fillins/path_service.h\"",
      "using": ["bssl::fillins::PathService"]},

pki/parse_values.cc

diff --git a/pki/parse_values.cc b/pki/parse_values.cc
index 8293381..7c142f8 100644
--- a/pki/parse_values.cc
+++ b/pki/parse_values.cc
@@ -8,7 +8,7 @@
 #include <vector>
 
 
-#include "fillins/string_util.h"
+#include "fillins/fillins_string_util.h"
 
 #include "fillins/utf_string_conversions.h"
 #include "fillins/inet.h"

pki/pem.cc

diff --git a/pki/pem.cc b/pki/pem.cc
index 928dbc7..1c12448 100644
--- a/pki/pem.cc
+++ b/pki/pem.cc
@@ -8,7 +8,7 @@
 #include "fillins/fillins_base64.h"
 #include <string_view>
 
-#include "fillins/string_util.h"
+#include "fillins/fillins_string_util.h"
 
 namespace {
 

sources.cmake

diff --git a/sources.cmake b/sources.cmake
index f99ad28..72a8a0f 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -356,7 +356,7 @@
   pki/fillins/fillins_base64.cc
   pki/fillins/ip_address.cc
   pki/fillins/openssl_util.cc
-  pki/fillins/string_util.cc
+  pki/fillins/fillins_string_util.cc
   pki/fillins/utf_string_conversions.cc
   pki/general_names.cc
   pki/input.cc