升级re2 到20240702

Signed-off-by:ganchuantao1<ganchuantao1@huawei.com>

Signed-off-by: ganchuantao1 <ganchuantao1@huawei.com>

BUILD.gn

@@ -26,6 +26,7 @@ config("re2_public_config") {
 }
 ohos_shared_library("re2") {
   sources = [
+    "${RE2_DIR}/re2/bitmap256.cc",
     "${RE2_DIR}/re2/bitmap256.h",
     "${RE2_DIR}/re2/bitstate.cc",
     "${RE2_DIR}/re2/compile.cc",
@@ -50,7 +51,6 @@ ohos_shared_library("re2") {
     "${RE2_DIR}/re2/simplify.cc",
     "${RE2_DIR}/re2/sparse_array.h",
     "${RE2_DIR}/re2/sparse_set.h",
-    "${RE2_DIR}/re2/stringpiece.cc",
     "${RE2_DIR}/re2/tostring.cc",
     "${RE2_DIR}/re2/unicode_casefold.cc",
     "${RE2_DIR}/re2/unicode_casefold.h",
@@ -70,6 +70,17 @@ ohos_shared_library("re2") {
   if (!is_asan && !is_debug) {
     version_script = "libre2.map"
   }
+  external_deps = [
+    "abseil-cpp:absl_base",
+    "abseil-cpp:absl_container",
+    "abseil-cpp:absl_cord",
+    "abseil-cpp:absl_hash",
+    "abseil-cpp:absl_log",
+    "abseil-cpp:absl_raw_logging_internal",
+    "abseil-cpp:absl_spinlock_wait",
+    "abseil-cpp:absl_str_format_internal",
+    "abseil-cpp:absl_strings",
+  ]
   public_configs = [ ":re2_public_config" ]
   install_enable = true
   subsystem_name = "${THIRDPARTY_RE2_SUBSYS_NAME}"

README.OpenSource

@@ -3,8 +3,8 @@
     "Name": "openEuler:re2",
     "License": "BSD 3-Clause License",
     "License File": "LICENSE",
-    "Version Number": "20211101-3.oe2203sp3",
-    "Upstream URL": "https://www.openeuler.org",
+    "Version Number": "2024-07-02",
+    "Upstream URL": "https://github.com/google/re2",
     "Description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library."
   }
 ]

bundle.json

@@ -23,7 +23,9 @@
         "rom": "",
         "ram": "",
         "deps": {
-            "components": [],
+            "components": [
+                "abseil-cpp"
+            ],
             "third_party": []
         },
         "build": {

install.sh

@@ -11,6 +11,6 @@ cd $1
 if [ -d "re2" ];then
     rm -rf re2
 fi
-tar zxvf re2-2021-11-01.tar.gz
-mv re2-2021-11-01 re2
+tar zxvf re2-2024-07-02.tar.gz
+mv re2-2024-07-02 re2
 exit 0

libre2.map

@@ -9,6 +9,10 @@
     *re2_internal*;
     "re2::RE2::FindAndConsumeN(re2::StringPiece*, re2::RE2 const&, re2::RE2::Arg const* const*, int)";
     "re2::RE2::QuoteMeta(re2::StringPiece const&)";
+    "re2::RE2::GlobalReplace(std::__h::basic_string<char, std::__h::char_traits<char>, std::__h::allocator<char>>*, re2::RE2 const&, std::__h::basic_string_view<char, std::__h::char_traits<char>>)";
+    "re2::RE2::RE2(std::__h::basic_string_view<char, std::__h::char_traits<char>>, re2::RE2::Options const&)";
+    "re2::RE2::FullMatchN(re2::StringPiece const&, re2::RE2 const&, re2::RE2::Arg const* const*, int)";
+    "re2::RE2::FullMatchN(std::__h::basic_string_view<char, std::__h::char_traits<char>>, re2::RE2 const&, re2::RE2::Arg const* const*, int)";
   };
   local:
     *;