Widevine Version Number for NYC-MR1

(This is a merge of go/wvgerrit/20402)

This updates the version number to v4.1.0 for the NYC-MR1 release. It
also updates the canary to pass on the nyc-mr1-dev branch.

Bug: 30813903
Change-Id: I05de038ff52e9f7633efff7011052b48b59d90fa
This commit is contained in:
John "Juce" Bruce
2016-08-23 15:34:39 -07:00
parent eeb6606784
commit 15ca8148a8
2 changed files with 4 additions and 5 deletions

View File

@@ -3215,17 +3215,16 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
char release_number[PROPERTY_VALUE_MAX];
ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
0);
EXPECT_STREQ("7.0", release_number)
EXPECT_STREQ("7.1", release_number)
<< "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("v4.0.0-android", widevine_version)
EXPECT_EQ("v4.1.0-android", widevine_version)
<< "The Widevine CDM version number has changed. Did you forget to "
"update "
"this test after changing it?";
"update this test after changing it?";
}
TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {