From 0aa9b47b031b14bf9c5cda5fb145a0cd25ea88b0 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 8 Nov 2021 19:02:25 -0800 Subject: [PATCH] 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 --- libwvdrmengine/cdm/test/request_license_test.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 976775c8..7597a79d 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -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) {