Sync Android CDM Version with OEMCrypto
(This is a cherry-pick of http://go/ag/3684977 that got left behind when pi-dev was branched.) The various Shared Source CDM groups have agreed on a more unified version numbering scheme. Henceforth, the pattern for the version number will be: <max-oemcrypto-version-supported>.<minor-version>.<patch-version> Where "minor-version" and "patch-version" are incremented independently at the discretion of each CDM product. This patch updates the version number for the Android CDM to match the new scheme and updates the relevant tests. Bug: 73090259 Test: request_license_test --gtest_filter=VersionNumberTest.* Merged-In: Idcead5d92565dd549aa35565da632f01abb9e513 Change-Id: Idcead5d92565dd549aa35565da632f01abb9e513
This commit is contained in:
@@ -19,7 +19,7 @@ const char kL2Dir[] = "/L2/";
|
||||
const char kL3Dir[] = "/L3/";
|
||||
const char kFactoryKeyboxPath[] = "/factory/wv.keys";
|
||||
|
||||
const char kWVCdmVersion[] = "v6.0.0-android";
|
||||
const char kWVCdmVersion[] = "14.0.0";
|
||||
|
||||
bool GetAndroidProperty(const char* key, std::string* value) {
|
||||
char val[PROPERTY_VALUE_MAX];
|
||||
|
||||
@@ -3806,7 +3806,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
|
||||
|
||||
std::string widevine_version;
|
||||
ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version));
|
||||
EXPECT_EQ("v6.0.0-android", widevine_version)
|
||||
EXPECT_EQ("14.0.0", widevine_version)
|
||||
<< "The Widevine CDM version number has changed. Did you forget to "
|
||||
"update this test after changing it?";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user