Move the CDM version string to a header file

[ Merge of http://go/wvgerrit/95943 ]

The CDM version for android is now defined in a platform specific
header file. A check for version number match has been removed
from integration tests as it will always be true. We will still
get a notification to change the CDM version when the Android OS
version gets updated.

Bug: 151663718
Test: WV unit/integration tests
Change-Id: I96bac87186e30a709585514be7f338ad2209cdf6
This commit is contained in:
Rahul Frias
2020-03-16 14:55:37 -07:00
parent 7cd0aacedb
commit ca39586f8d
3 changed files with 15 additions and 10 deletions

View File

@@ -5646,13 +5646,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
EXPECT_STREQ("R", release_number.c_str())
<< "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in "
"properties_android.cpp.";
std::string widevine_version;
ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version));
EXPECT_EQ("16.0.0", widevine_version)
<< "The Widevine CDM version number has changed. Did you forget to "
"update this test after changing it?";
"wv_android_constants.h";
}
TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {