From 5f980424e2287b92c6156158287f9cddc4219ae8 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 8 Feb 2024 00:41:40 -0800 Subject: [PATCH] Fix 12 IncludeCleaner findings: * Used header "video/widevine/export/common/oemcrypto_core_message/odk/include/OEMCryptoCENCCommon.h" is not included directly (4 times) * Used header "video/widevine/export/common/oemcrypto_core_message/odk/include/core_message_features.h" is not included directly (3 times) * Used header "video/widevine/protos/public/certificate_provisioning.proto.h" is not included directly (2 times) * Used header "video/widevine/export/common/oemcrypto_core_message/odk/include/odk_structs.h" is not included directly * Used header "video/widevine/export/common/oemcrypto_core_message/odk/include/odk_target.h" is not included directly * Used header "third_party/absl/log/log.h" is not included directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * See go/include-cleaner for more information about the tool that generated this change. * The global approvers for this change category are currently piloting the go/reviewbot tool so you may see global-review-bot-composite as the approver. Please contact code-health-team@google.com if you have any questions/concerns about the approval process. See go/include-cleaner-lsc-approval for more information on why you've received this change and why it is important. This CL looks good? Just LGTM and Approve it! This CL doesn’t look good? This is what you can do: * Revert this CL, by replying "REVERT: " * File a bug under go/include-cleaner-bug for category IncludeCleaner if there's an issue with the CL content. * File a bug under go/rosie-bug if there's an issue with how the CL was managed. * For all other issues such as the formatting of the CL, please file a bug under go/clrobot-bug. * Revert this CL and not get a CL that cleans up these paths in the future by replying "BLOCKLIST: ". This is not reversible! We recommend to opt out the respective paths in your CL Robot configuration instead: go/clrobot-opt-out. This CL was generated by CL Robot - a tool that cleans up code findings (go/clrobot). The affected code paths have been enabled for CL Robot in //depot/google3/METADATA by following go/clrobot#how-to-opt-in. Anything wrong with the signup? File a bug at go/clrobot-bug. #codehealth Tested: Local presubmit tests passed. PiperOrigin-RevId: 605228343 Change-Id: I7f5f581b6b2e2b359317324df7097f9da101ab94 --- libwvdrmengine/oemcrypto/odk/include/odk_structs.h | 2 +- libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp | 3 +++ libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp | 2 ++ libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp | 2 ++ libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp | 2 ++ libwvdrmengine/oemcrypto/odk/test/odk_test.cpp | 2 ++ libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h | 1 + 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h index f18a0c85..b3bf0c50 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 2024-01-30" +#define ODK_RELEASE_DATE "ODK v19.0 2024-02-08" /* The lowest version number for an ODK message. */ #define ODK_FIRST_VERSION 16 diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp index 20658839..bea78914 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_core_message_test.cpp @@ -13,7 +13,10 @@ #include "core_message_serialize_proto.h" #include "core_message_types.h" #include "gtest/gtest.h" +#include "license_protocol.pb.h" #include "odk.h" +#include "odk_structs.h" +#include "third_party/absl/log/log.h" #include "third_party/absl/strings/escaping.h" namespace wvodk_test { diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp index d3375a07..3dcf1f79 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v16.cpp @@ -6,7 +6,9 @@ #include #include +#include "OEMCryptoCENCCommon.h" #include "core_message_deserialize.h" +#include "core_message_features.h" #include "core_message_serialize.h" #include "core_message_serialize_proto.h" #include "core_message_types.h" diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp index b29bd00b..e1e832ce 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v17.cpp @@ -6,7 +6,9 @@ #include #include +#include "OEMCryptoCENCCommon.h" #include "core_message_deserialize.h" +#include "core_message_features.h" #include "core_message_serialize.h" #include "core_message_serialize_proto.h" #include "core_message_types.h" diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp index 7674f012..acbd8dc1 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_golden_v18.cpp @@ -6,7 +6,9 @@ #include #include +#include "OEMCryptoCENCCommon.h" #include "core_message_deserialize.h" +#include "core_message_features.h" #include "core_message_serialize.h" #include "core_message_serialize_proto.h" #include "core_message_types.h" diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp index 7b22fef3..955741ca 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp @@ -18,9 +18,11 @@ #include "core_message_serialize_proto.h" #include "core_message_types.h" #include "gtest/gtest.h" +#include "license_protocol.pb.h" #include "odk_overflow.h" #include "odk_structs.h" #include "odk_structs_priv.h" +#include "odk_target.h" #include "odk_test_helper.h" namespace wvodk_test { diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h index 384c6696..5005b94f 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h +++ b/libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h @@ -9,6 +9,7 @@ #include #include +#include "OEMCryptoCENCCommon.h" #include "odk_structs.h" #include "odk_structs_priv.h"