From 6e5c13dac3d1366bbf5a9118aa468522eff07f56 Mon Sep 17 00:00:00 2001 From: hw-wLiu Date: Fri, 17 Feb 2023 06:37:13 +0000 Subject: [PATCH] =?UTF-8?q?protobuf=E4=BF=AE=E6=94=B9so=E8=A3=81=E5=89=AA?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=BB=84=E5=8C=BA=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E9=97=AE=E9=A2=98=E5=90=88monthly10?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hw-wLiu --- BUILD.gn | 8 ++++-- libprotobuf.map | 29 ++++++++++++++++++++- libprotobuf_lite.map | 62 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 59532a3..ee979b2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -48,7 +48,9 @@ ohos_shared_library("protobuf_lite") { "src/google/protobuf/stubs/time.cc", "src/google/protobuf/wire_format_lite.cc", ] - version_script = "libprotobuf_lite.map" + if (!is_asan) { + version_script = "libprotobuf_lite.map" + } include_dirs = [ "src/google/protobuf/**/*.h", "src/google/protobuf/**/*.inc", @@ -198,7 +200,9 @@ ohos_shared_library("protobuf") { ] deps = [ ":protobuf_lite" ] - version_script = "libprotobuf.map" + if (!is_asan) { + version_script = "libprotobuf.map" + } public_configs = [ ":protobuf_config" ] install_enable = true diff --git a/libprotobuf.map b/libprotobuf.map index dfd266e..79f6275 100644 --- a/libprotobuf.map +++ b/libprotobuf.map @@ -134,7 +134,34 @@ "google::protobuf::internal::ComputeUnknownFieldsSize(google::protobuf::internal::InternalMetadata const&, unsigned int, google::protobuf::internal::CachedSize*)"; "google::protobuf::Message::GetTypeName() const"; "google::protobuf::Message::InitializationErrorString() const"; + "google::protobuf::TextFormat::ParseFromString(std::__1::basic_string, std::__1::allocator > const&, google::protobuf::Message*)"; + "google::protobuf::TextFormat::PrintToString(google::protobuf::Message const&, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::strings::Substitute(char const*, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&, google::protobuf::strings::internal::SubstituteArg const&)"; + "google::protobuf::MergedDescriptorDatabase::MergedDescriptorDatabase(std::__1::vector > const&)"; + "google::protobuf::compiler::DiskSourceTree::MapPath(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::DescriptorPool::AddUnusedImportTrackFile(std::__1::basic_string, std::__1::allocator > const&, bool)"; + "google::protobuf::DescriptorPool::FindFileByName(std::__1::basic_string, std::__1::allocator > const&) const"; + "google::protobuf::io::Printer::Print(std::__1::map, std::__1::allocator >, std::__1::basic_string, std::__1::allocator >, std::__1::less, std::__1::allocator > >, std::__1::allocator, std::__1::allocator > const, std::__1::basic_string, std::__1::allocator > > > > const&, char const*)"; + "google::protobuf::compiler::DiskSourceTree::VirtualFileToDiskFile(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::DescriptorPool::FindMessageTypeByName(std::__1::basic_string, std::__1::allocator > const&) const"; + "google::protobuf::compiler::DiskSourceTree::DiskFileToVirtualFile(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator >*, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::io::Printer::FormatInternal(std::__1::vector, std::__1::allocator >, std::__1::allocator, std::__1::allocator > > > const&, std::__1::map, std::__1::allocator >, std::__1::basic_string, std::__1::allocator >, std::__1::less, std::__1::allocator > >, std::__1::allocator, std::__1::allocator > const, std::__1::basic_string, std::__1::allocator > > > > const&, char const*)"; + "google::protobuf::EnumDescriptor::GetLocationPath(std::__1::vector >*) const"; + "google::protobuf::EnumValueDescriptor::GetLocationPath(std::__1::vector >*) const"; + "google::protobuf::FieldDescriptor::GetLocationPath(std::__1::vector >*) const"; + "google::protobuf::Descriptor::GetLocationPath(std::__1::vector >*) const"; + "google::protobuf::Descriptor::FindFieldByCamelcaseName(std::__1::basic_string, std::__1::allocator > const&) const"; + "google::protobuf::Descriptor::FindFieldByName(std::__1::basic_string, std::__1::allocator > const&) const"; + "google::protobuf::FieldDescriptor::DebugStringWithOptions(google::protobuf::DebugStringOptions const&) const"; + "google::protobuf::Reflection::ListFields(google::protobuf::Message const&, std::__1::vector >*) const"; + "google::protobuf::OneofDescriptor::GetLocationPath(std::__1::vector >*) const"; + "google::protobuf::internal::NameOfEnum(google::protobuf::EnumDescriptor const*, int)"; + "google::protobuf::FieldDescriptor::DebugString() const"; + "google::protobuf::EnumValueDescriptor::DebugString() const"; + "google::protobuf::MethodDescriptor::DebugString() const"; + "google::protobuf::io::Printer::Annotate(char const*, char const*, std::__1::basic_string, std::__1::allocator > const&, std::__1::vector > const&)"; + "google::protobuf::FileDescriptor::GetSourceLocation(std::__1::vector > const&, google::protobuf::SourceLocation*) const"; }; local: *; -}; \ No newline at end of file +}; diff --git a/libprotobuf_lite.map b/libprotobuf_lite.map index df447db..a2cf34d 100644 --- a/libprotobuf_lite.map +++ b/libprotobuf_lite.map @@ -429,6 +429,68 @@ "google::protobuf::RepeatedField::Add(int const&)"; "google::protobuf::RepeatedField::Add(unsigned int const&)"; "google::protobuf::SetLogHandler(void (*)(google::protobuf::LogLevel, char const*, int, std::__h::basic_string, std::__h::allocator > const&))"; + "google::protobuf::RepeatedPtrField, std::__1::allocator > >::~RepeatedPtrField()"; + "google::protobuf::internal::InlineGreedyStringParser(std::__1::basic_string, std::__1::allocator >*, char const*, google::protobuf::internal::ParseContext*)"; + "google::protobuf::internal::UnknownFieldParse(unsigned int, std::__1::basic_string, std::__1::allocator >*, char const*,"; + "google::protobuf::internal::InlineGreedyStringParser(std::__1::basic_string, std::__1::allocator >*, char const*, google::protobuf::internal::ParseContext*)"; + "google::protobuf::io::EpsCopyOutputStream::WriteStringOutline(unsigned int, std::__1::basic_string, std::__1::allocator > const&, unsigned char*)"; + "google::protobuf::io::EpsCopyOutputStream::WriteStringMaybeAliasedOutline(unsigned int, std::__1::basic_string, std::__1::allocator > const&, unsigned char*)"; + "google::protobuf::internal::InlineGreedyStringParser(std::__1::basic_string, std::__1::allocator >*, char const*, google::protobuf::internal::ParseContext*)"; + "google::protobuf::internal::UnknownFieldParse(unsigned int, std::__1::basic_string, std::__1::allocator >*, char const*,"; + "google::protobuf::io::EpsCopyOutputStream::WriteStringMaybeAliasedOutline(unsigned int, std::__1::basic_string, std::__1::allocator > const&, unsigned char*)"; + "google::protobuf::internal::InlineGreedyStringParser(std::__1::basic_string, std::__1::allocator >*, char const*, google::protobuf::internal::ParseContext*)"; + "google::protobuf::internal::UnknownFieldParse(unsigned int, std::__1::basic_string, std::__1::allocator >*, char const*,"; + "google::protobuf::internal::InitializeEnumStrings(google::protobuf::internal::EnumEntry const*, int const*, unsigned long,"; + "google::protobuf::internal::WriteVarint(unsigned int, unsigned long, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::internal::UnknownFieldParse(unsigned int, std::__1::basic_string, std::__1::allocator >*, char const*,"; + "google::protobuf::internal::InitializeEnumStrings(google::protobuf::internal::EnumEntry const*, int const*, unsigned long, google::protobuf::internal::ExplicitlyConstructed, std::__1::allocator > >*)"; + "google::protobuf::internal::UnknownFieldParse(unsigned int, std::__1::basic_string, std::__1::allocator >*, char const*, google::protobuf::internal::ParseContext*)"; + "google::protobuf::MessageLite::SerializeToString(std::__1::basic_string, std::__1::allocator >*) const"; + "google::protobuf::MessageLite::ParseFromString(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::internal::ParseAnyTypeUrl(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::SplitStringUsing(google::protobuf::StringPiece, char const*, std::__1::vector, std::__1::allocator >, std::__1::allocator, std::__1::allocator > > >*)"; + "google::protobuf::StrAppend(std::__1::basic_string, std::__1::allocator >*, google::protobuf::strings::AlphaNum const&)"; + "google::protobuf::internal::LogMessage::operator<<(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::CEscape(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::StrAppend(std::__1::basic_string, std::__1::allocator >*, google::protobuf::strings::AlphaNum const&)"; + "google::protobuf::MessageLite::AppendToString(std::__1::basic_string, std::__1::allocator >*) const"; + "google::protobuf::UnescapeCEscapeString(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::io::StringOutputStream::StringOutputStream(std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::StripWhitespace(std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::internal::WireFormatLite::ReadBytes(google::protobuf::io::CodedInputStream*, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::io::CodedInputStream::ReadString(std::__1::basic_string, std::__1::allocator >*, int)"; + "google::protobuf::internal::EpsCopyInputStream::ReadStringFallback(char const*, int, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::internal::StringSpaceUsedExcludingSelfLong(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::internal::ExtensionSet::GetString(int, std::__1::basic_string, std::__1::allocator > const&) const"; + "google::protobuf::internal::GenericTypeHandler, std::__1::allocator > >::Merge(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::StringAppendF(std::__1::basic_string, std::__1::allocator >*, char const*, ...)"; + "google::protobuf::internal::ParseAnyTypeUrl(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator >*, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::safe_strto32(std::__1::basic_string, std::__1::allocator > const&, int*)"; + "google::protobuf::MessageLite::AppendPartialToString(std::__1::basic_string, std::__1::allocator >*) const"; + "google::protobuf::strings::Utf8SafeCEscape(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::io::OstreamOutputStream::OstreamOutputStream(std::__1::basic_ostream >*, int)"; + "google::protobuf::safe_strtou32(std::__1::basic_string, std::__1::allocator > const&, unsigned int*)"; + "google::protobuf::safe_strto64(std::__1::basic_string, std::__1::allocator > const&, long*)"; + "google::protobuf::safe_strtou64(std::__1::basic_string, std::__1::allocator > const&, unsigned long*)"; + "google::protobuf::WebSafeBase64Escape(google::protobuf::StringPiece, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::Base64Escape(google::protobuf::StringPiece, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::WebSafeBase64Unescape(google::protobuf::StringPiece, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::Base64Unescape(google::protobuf::StringPiece, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::Base64Escape(unsigned char const*, int, std::__1::basic_string, std::__1::allocator >*, bool)"; + "google::protobuf::WebSafeBase64EscapeWithPadding(google::protobuf::StringPiece, std::__1::basic_string, std::__1::allocator >*)"; + "google::protobuf::StrAppend(std::__1::basic_string, std::__1::allocator >*, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&)"; + "google::protobuf::StrAppend(std::__1::basic_string, std::__1::allocator >*, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&)"; + "google::protobuf::internal::WireFormatLite::WriteString(int, std::__1::basic_string, std::__1::allocator > const&, google::protobuf::io::CodedOutputStream*)"; + "google::protobuf::internal::WireFormatLite::WriteBytes(int, std::__1::basic_string, std::__1::allocator > const&, google::protobuf::io::CodedOutputStream*)"; + "google::protobuf::internal::ParseTime(std::__1::basic_string, std::__1::allocator > const&, long*, int*)"; + "google::protobuf::MessageLite::ParsePartialFromString(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::StringReplace(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator > const&, bool)"; + "google::protobuf::internal::VersionString(int)"; + "google::protobuf::StrCat(google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&, google::protobuf::strings::AlphaNum const&)"; + "google::protobuf::SplitStringAllowEmpty(google::protobuf::StringPiece, char const*, std::__1::vector, std::__1::allocator >, std::__1::allocator, std::__1::allocator > > >*)"; + "google::protobuf::ReplaceCharacters(std::__1::basic_string, std::__1::allocator >*, char const*, char)"; + "google::protobuf::strings::CHexEscape(std::__1::basic_string, std::__1::allocator > const&)"; + "google::protobuf::GlobalReplaceSubstring(std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator > const&, std::__1::basic_string, std::__1::allocator >*)"; }; local: *; -- Gitee