widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit copybara rules to remove absl::Span

Browse Source 
PiperOrigin-RevId: 601558492
Change-Id: Id09178209b9258c810b61c749582c995fac518b1
This commit is contained in:
Matt Feddersen
2024-01-25 14:00:08 -08:00
committed by Robert Shih
parent 6bf182af45
commit b239b11b60
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
View File

@@ -22,7 +22,6 @@
#include "odk_structs.h" #include "odk_structs.h"
#include "odk_structs_priv.h" #include "odk_structs_priv.h"
#include "odk_test_helper.h" #include "odk_test_helper.h"
#include "third_party/absl/types/span.h"
namespace wvodk_test { namespace wvodk_test {
@@ -113,7 +112,7 @@ bool CheckCounterInfoIsEqual(ODK_MessageCounterInfo* a, ODK_MessageCounter* b) {
template <typename T, typename F, typename G> template <typename T, typename F, typename G>
void ValidateRequest(uint32_t message_type, void ValidateRequest(uint32_t message_type,
absl::Span<const ODK_Field> extra_fields, const std::vector<ODK_Field>& extra_fields,
const F& odk_prepare_func, const G& kdo_parse_func) { const F& odk_prepare_func, const G& kdo_parse_func) {
uint32_t message_size = 0; uint32_t message_size = 0;
uint16_t api_major_version = ODK_MAJOR_VERSION; uint16_t api_major_version = ODK_MAJOR_VERSION;

5
libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp
View File

@@ -20,7 +20,6 @@
#include "odk_endian.h" #include "odk_endian.h"
#include "odk_structs.h" #include "odk_structs.h"
#include "odk_structs_priv.h" #include "odk_structs_priv.h"
#include "third_party/absl/types/span.h"
namespace wvodk_test { namespace wvodk_test {
@@ -671,7 +670,7 @@ OEMCryptoResult ODK_DumpSingleField(const uint8_t* buf,
*/ */
OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf, OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf,
const size_t size_in, size_t* size_out, const size_t size_in, size_t* size_out,
absl::Span<const ODK_Field> fields) { const std::vector<ODK_Field>& fields) {
if (buf == nullptr || size_out == nullptr) { if (buf == nullptr || size_out == nullptr) {
return ODK_ERROR_CORE_MESSAGE; return ODK_ERROR_CORE_MESSAGE;
} }
@@ -709,7 +708,7 @@ OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf,
} }
std::vector<ODK_Field> ODK_MakeTotalFields( std::vector<ODK_Field> ODK_MakeTotalFields(
absl::Span<const ODK_Field> extra_fields, ODK_CoreMessage* core_message) { const std::vector<ODK_Field>& extra_fields, ODK_CoreMessage* core_message) {
std::vector<ODK_Field> total_fields = { std::vector<ODK_Field> total_fields = {
{ODK_UINT32, &(core_message->message_type), "message_type"}, {ODK_UINT32, &(core_message->message_type), "message_type"},
{ODK_UINT32, &(core_message->message_length), "message_size"}, {ODK_UINT32, &(core_message->message_length), "message_size"},

3
libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h
View File

@@ -11,7 +11,6 @@
#include "odk_structs.h" #include "odk_structs.h"
#include "odk_structs_priv.h" #include "odk_structs_priv.h"
#include "third_party/absl/types/span.h"
namespace wvodk_test { namespace wvodk_test {
@@ -116,7 +115,7 @@ OEMCryptoResult ODK_ReadSingleField(const uint8_t* buf, const ODK_Field* field);
OEMCryptoResult ODK_DumpSingleField(const uint8_t* buf, const ODK_Field* field); OEMCryptoResult ODK_DumpSingleField(const uint8_t* buf, const ODK_Field* field);
OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf, size_t size_in, OEMCryptoResult ODK_IterFields(ODK_FieldMode mode, uint8_t* buf, size_t size_in,
size_t* size_out, size_t* size_out,
absl::Span<const ODK_Field> fields); const std::vector<ODK_Field>& fields);
void ODK_ExpectEqualBuf(const void* s1, const void* s2, size_t n, void ODK_ExpectEqualBuf(const void* s1, const void* s2, size_t n,
const std::vector<ODK_Field>& fields); const std::vector<ODK_Field>& fields);
void ODK_ResetOdkFields(std::vector<ODK_Field>* fields); void ODK_ResetOdkFields(std::vector<ODK_Field>* fields);