widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc Windows fixes.

Browse Source 
(This is a merge of http://go/wvgerrit/70324)

- Add build settings for Windows.
- Conditionally add pthread.
- Add dummy DLLMain method.
- Fix #if checks for Windows.
- Remove designated initializers which aren't supported in MSVC.
- Remove variable length array.

Test: Android Unit Tests
Bug: 122953649
Change-Id: I14f16e7ce4b3ff17ee0139ea6c2f7243ae999aa1
This commit is contained in:
Jacob Trimble
2019-01-25 15:05:00 -08:00
committed by John W. Bruce
parent 85e2c6a026
commit b3dd9c3711
6 changed files with 90 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
View File

@@ -38,57 +38,63 @@ const CdmUsageEntry kYetAnotherUsageEntry = "yet another usage entry";
const CdmUsageEntry kAndAnotherUsageEntry = "and another usage entry";
const CdmUsageEntry kOneMoreUsageEntry = "one more usage entry";
const CdmUsageEntryInfo kUsageEntryInfoOfflineLicense1 = {
.storage_type = kStorageLicense,
.key_set_id = "offline_key_set_1",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "offline_key_set_1",
/* usage_info_file_name = */ "",
};
const CdmUsageEntryInfo kUsageEntryInfoOfflineLicense2 = {
.storage_type = kStorageLicense,
.key_set_id = "offline_key_set_2",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "offline_key_set_2",
/* usage_info_file_name = */ "",
};
const CdmUsageEntryInfo kUsageEntryInfoOfflineLicense3 = {
.storage_type = kStorageLicense,
.key_set_id = "offline_key_set_3",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "offline_key_set_3",
/* usage_info_file_name = */ ""};
const CdmUsageEntryInfo kUsageEntryInfoOfflineLicense4 = {
.storage_type = kStorageLicense,
.key_set_id = "offline_key_set_4",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "offline_key_set_4",
/* usage_info_file_name = */ ""};
const CdmUsageEntryInfo kUsageEntryInfoOfflineLicense5 = {
.storage_type = kStorageLicense,
.key_set_id = "offline_key_set_5",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "offline_key_set_5",
/* usage_info_file_name = */ ""};
const CdmUsageEntryInfo kUsageEntryInfoOfflineLicense6 = {
.storage_type = kStorageLicense,
.key_set_id = "offline_key_set_6",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "offline_key_set_6",
/* usage_info_file_name = */ ""};
const CdmUsageEntryInfo kUsageEntryInfoSecureStop1 = {
.storage_type = kStorageUsageInfo,
.key_set_id = "secure_stop_key_set_1",
.usage_info_file_name = "usage_info_file_1"};
/* storage_type = */ kStorageUsageInfo,
/* key_set_id = */ "secure_stop_key_set_1",
/* usage_info_file_name = */ "usage_info_file_1",
};
const CdmUsageEntryInfo kUsageEntryInfoSecureStop2 = {
.storage_type = kStorageUsageInfo,
.key_set_id = "secure_stop_key_set_2",
.usage_info_file_name = "usage_info_file_2"};
/* storage_type = */ kStorageUsageInfo,
/* key_set_id = */ "secure_stop_key_set_2",
/* usage_info_file_name = */ "usage_info_file_2",
};
const CdmUsageEntryInfo kUsageEntryInfoSecureStop3 = {
.storage_type = kStorageUsageInfo,
.key_set_id = "secure_stop_key_set_3",
.usage_info_file_name = "usage_info_file_3"};
/* storage_type = */ kStorageUsageInfo,
/* key_set_id = */ "secure_stop_key_set_3",
/* usage_info_file_name = */ "usage_info_file_3"};
const CdmUsageEntryInfo kUsageEntryInfoSecureStop4 = {
.storage_type = kStorageUsageInfo,
.key_set_id = "secure_stop_key_set_4",
.usage_info_file_name = "usage_info_file_4"};
/* storage_type = */ kStorageUsageInfo,
/* key_set_id = */ "secure_stop_key_set_4",
/* usage_info_file_name = */ "usage_info_file_4"};
const CdmUsageEntryInfo kUsageEntryInfoSecureStop5 = {
.storage_type = kStorageUsageInfo,
.key_set_id = "secure_stop_key_set_5",
.usage_info_file_name = "usage_info_file_5"};
/* storage_type = */ kStorageUsageInfo,
/* key_set_id = */ "secure_stop_key_set_5",
/* usage_info_file_name = */ "usage_info_file_5"};
const CdmUsageEntryInfo kUsageEntryInfoStorageTypeUnknown = {
.storage_type = kStorageTypeUnknown,
.key_set_id = "",
.usage_info_file_name = ""};
/* storage_type = */ kStorageTypeUnknown,
/* key_set_id = */ "",
/* usage_info_file_name = */ "",
};
const CdmUsageEntryInfo kDummyUsageEntryInfo = {
.storage_type = kStorageLicense,
.key_set_id = "DummyKsid",
.usage_info_file_name = ""};
/* storage_type = */ kStorageLicense,
/* key_set_id = */ "DummyKsid",
/* usage_info_file_name = */ "",
};
const std::vector<std::string> kEmptyLicenseList;
@@ -113,28 +119,28 @@ const size_t kUsageInfoFileArraySize = sizeof(kUsageInfoFileArray)/
std::vector<std::string> kUsageInfoFileList;
const DeviceFiles::CdmUsageData kCdmUsageData1 = {
.provider_session_token = "provider_session_token_1",
.license_request = "license_request_1",
.license = "license_1",
.key_set_id = "key_set_id_1",
.usage_entry = "usage_entry_1",
.usage_entry_number = 0,
/* provider_session_token = */ "provider_session_token_1",
/* license_request = */ "license_request_1",
/* license = */ "license_1",
/* key_set_id = */ "key_set_id_1",
/* usage_entry = */ "usage_entry_1",
/* usage_entry_number = */ 0,
};
const DeviceFiles::CdmUsageData kCdmUsageData2 = {
.provider_session_token = "provider_session_token_2",
.license_request = "license_request_2",
.license = "license_2",
.key_set_id = "key_set_id_2",
.usage_entry = "usage_entry_2",
.usage_entry_number = 0,
/* provider_session_token = */ "provider_session_token_2",
/* license_request = */ "license_request_2",
/* license = */ "license_2",
/* key_set_id = */ "key_set_id_2",
/* usage_entry = */ "usage_entry_2",
/* usage_entry_number = */ 0,
};
const DeviceFiles::CdmUsageData kCdmUsageData3 = {
.provider_session_token = "provider_session_token_3",
.license_request = "license_request_3",
.license = "license_3",
.key_set_id = "key_set_id_3",
.usage_entry = "usage_entry_3",
.usage_entry_number = 0,
/* provider_session_token = */ "provider_session_token_3",
/* license_request = */ "license_request_3",
/* license = */ "license_3",
/* key_set_id = */ "key_set_id_3",
/* usage_entry = */ "usage_entry_3",
/* usage_entry_number = */ 0,
};
const std::vector<DeviceFiles::CdmUsageData> kEmptyUsageInfoUsageDataList;