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

Fix empty struct error

Browse Source 
I added an empty ODK_ParsedRelease struct in ODK in case we want to add fields for release requests in the future but this is causing an error in C. Removing it for now. Will add it if needed for future unit tests.

PiperOrigin-RevId: 581059171
Change-Id: Ic547cf3cef3cf89f503f39cff27888d77056eddc
This commit is contained in:
Vicky Min
2023-11-09 16:31:42 -08:00
committed by Robert Shih
parent 4d7025e517
commit c8ac9c5cd7
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libwvdrmengine/oemcrypto/odk/include/odk_structs.h
View File

@@ -19,7 +19,7 @@ extern "C" {
#define ODK_MINOR_VERSION 0 #define ODK_MINOR_VERSION 0
/* ODK Version string. Date changed automatically on each release. */ /* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v19.0 2023-11-08" #define ODK_RELEASE_DATE "ODK v19.0 2023-11-10"
/* The lowest version number for an ODK message. */ /* The lowest version number for an ODK message. */
#define ODK_FIRST_VERSION 16 #define ODK_FIRST_VERSION 16
@@ -289,16 +289,6 @@ typedef struct {
OEMCrypto_KeyObject* key_array; OEMCrypto_KeyObject* key_array;
} ODK_Packing_ParsedLicense; } ODK_Packing_ParsedLicense;
/**
* The parsed release structure does not currently contain information from or
* about the license message. This struct is a placeholder for future cases
* where data may need to be added to the parsed release.
* @version
* This struct is new in API version 19.
*/
typedef struct {
} ODK_ParsedRelease;
/** /**
* The parsed provisioning structure contains information from the license * The parsed provisioning structure contains information from the license
* message. The function ODK_ParseProvisioning will fill in the fields of * message. The function ODK_ParseProvisioning will fill in the fields of

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

@@ -64,7 +64,6 @@ struct ODK_ReleaseResponseParams {
uint32_t clock_security_level; uint32_t clock_security_level;
int64_t seconds_since_license_requested; int64_t seconds_since_license_requested;
int64_t seconds_since_first_decrypt; int64_t seconds_since_first_decrypt;
ODK_ParsedRelease parsed_release;
std::vector<ODK_Field> extra_fields; std::vector<ODK_Field> extra_fields;
}; };