From 49debffe6353ba4bb96b4fe869d121821e3684cb Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Thu, 30 Nov 2023 14:01:39 -0800 Subject: [PATCH] Use absl::string_view in ODK Since enabling C++17 for Widevine, we should be able to use absl::string_view since copybara can automatically translate between absl::string_view and std::string_view. PiperOrigin-RevId: 586780379 Change-Id: I94d04bd3ab75085c482682539cf4bb2f046db864 --- libwvdrmengine/oemcrypto/odk/include/odk_structs.h | 2 +- .../oemcrypto/odk/src/core_message_serialize_proto.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h index 2ff0cef8..6f18d2a8 100644 --- a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h +++ b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h @@ -19,7 +19,7 @@ extern "C" { #define ODK_MINOR_VERSION 0 /* ODK Version string. Date changed automatically on each release. */ -#define ODK_RELEASE_DATE "ODK v19.0 2023-11-21" +#define ODK_RELEASE_DATE "ODK v19.0 2023-11-30" /* The lowest version number for an ODK message. */ #define ODK_FIRST_VERSION 16 diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize_proto.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize_proto.cpp index ff1b69cd..2559012f 100644 --- a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize_proto.cpp +++ b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize_proto.cpp @@ -9,8 +9,10 @@ #include #include #include +#include #include +#include "OEMCryptoCENCCommon.h" #include "core_message_serialize.h" #include "license_protocol.pb.h" #include "odk_serialize.h" @@ -32,8 +34,8 @@ using oemcrypto_core_message::features::CoreMessageFeatures; * message: serialized license protobuf * field: substring value */ -OEMCrypto_Substring GetOecSubstring(const std::string& message, - const std::string& field) { +OEMCrypto_Substring GetOecSubstring(std::string_view message, + std::string_view field) { OEMCrypto_Substring substring = {}; size_t pos = message.find(field); if (pos != std::string::npos) {