Update Version number

[ Merge of http://go/wvgerrit/138289 and http://go/ag/16210935 ]

Update the android version number test to accept "12" or "12L"

Bug: 205491167
Test: wv unit/integration tests
Change-Id: If11e7c6f3a89263ab78d274aa8d776991d3942e9
This commit is contained in:
Rahul Frias
2021-11-08 19:02:25 -08:00
parent f5e4c94e26
commit 0aa9b47b03

View File

@@ -5942,10 +5942,12 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
android::base::GetProperty("ro.build.version.release", "");
ASSERT_TRUE(release_number.size() > 0);
// Reminder to change the Widevine CDM version number.
EXPECT_EQ("12", release_number)
<< "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in "
"wv_android_constants.h";
// The android release number is "12" for sc-dev and "12L" for sc-v2-dev
EXPECT_TRUE(release_number.compare("12") == 0 ||
release_number.compare("12L") == 0)
<< "The Android version number has changed to " << release_number
<< ". You need to update this test and also possibly update the Widevine "
"version number in wv_android_constants.h";
}
TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {