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

Minor build updates

Browse Source 
This CL removes some unused variables, and changes some integers to
unsigned integers.  On some platforms, we were getting compiler errors
and unit test failures.

Merge from Widevine repo of http://go/wvgerrit/23840
    Use unsigned integer literals

Merge from Widevine repo of http://go/wvgerrit/23767
    Fix Gyp Files

Merge from Widevine repo of http://go/wvgerrit/23500
    Remove unused variables
    
bug: 31458046

Change-Id: I4dfec95ae49187262552fbbf322f3310ab777826
This commit is contained in:
Fred Gylys-Colwell
2017-02-09 14:59:15 -08:00
committed by Jeff Tinker
parent 1aac150100
commit eade07c7a9
7 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
View File

@@ -30,7 +30,7 @@ namespace wvoec_mock {
CryptoEngine::CryptoEngine(wvcdm::FileSystem* file_system)
: root_of_trust_(config_provisioning_method()),
file_system_(file_system),
usage_table_(this, file_system) {
usage_table_(this) {
ERR_load_crypto_strings();
}

6
libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
View File

@@ -79,9 +79,8 @@ class UsageTableEntry {
class UsageTable {
public:
UsageTable(CryptoEngine* ce, wvcdm::FileSystem* file_system)
: ce_(ce), file_system_(file_system), header_loaded_(false),
old_table_(NULL){};
explicit UsageTable(CryptoEngine* ce)
: ce_(ce), header_loaded_(false), old_table_(NULL){};
~UsageTable();
OEMCryptoResult CreateNewUsageEntry(SessionContext* session,
@@ -124,7 +123,6 @@ class UsageTable {
bool LoadGenerationNumber(bool or_make_new_one);
CryptoEngine* ce_;
wvcdm::FileSystem* file_system_;
bool header_loaded_;
int64_t master_generation_number_;
std::vector<int64_t> generation_numbers_;

2
libwvdrmengine/oemcrypto/test/oec_session_util.h
View File

@@ -107,7 +107,7 @@ struct RSAPrivateKeyMessage {
struct Test_PST_Report {
Test_PST_Report(const std::string& pst_in,
OEMCrypto_Usage_Entry_Status status_in)
: pst(pst_in), status(status_in) {}
: status(status_in), pst(pst_in) {}
OEMCrypto_Usage_Entry_Status status;
int64_t seconds_since_license_received;

2
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -5426,13 +5426,11 @@ TEST_F(UsageTableTest, TimingTest) {
loaded1,
first_decrypt1,
second_decrypt));
time_t report_generated2 = time(NULL);
ASSERT_NO_FATAL_FAILURE(s2.UpdateUsageEntry(&encrypted_usage_header_));
ASSERT_NO_FATAL_FAILURE(s2.GenerateVerifyReport(pst2, kActive,
loaded2,
first_decrypt2,
third_decrypt));
time_t report_generated3 = time(NULL);
ASSERT_NO_FATAL_FAILURE(s3.UpdateUsageEntry(&encrypted_usage_header_));
ASSERT_NO_FATAL_FAILURE(s3.GenerateVerifyReport(pst3, kUnused, loaded3));
}