Srujan Gaddam
28696a2125
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c am: 61510bbc8a
...
am: 971aa7d2d4
2019-05-25 10:34:07 -07:00
Srujan Gaddam
971aa7d2d4
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c
...
am: 61510bbc8a
2019-05-25 10:10:31 -07:00
Srujan Gaddam
61510bbc8a
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so
...
am: 45d02c545c
2019-05-25 09:58:50 -07:00
Haibo Huang
1d2ee2d4d7
Merge "Using ::testing::DoAll" into qt-dev-plus-aosp am: f078443fd7
...
am: 0222e219f6
2019-05-24 20:23:12 -07:00
Srujan Gaddam
45d02c545c
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so
...
Bug: b/133427576
Test: Unit tests on Taimen and Crosshatch
Merge of http://go/wvgerrit/79804
Currently, the run_all_unit_tests.sh script fails to load in the Level 1
OEMCrypto for some devices that don't have a 64-bit liboemcrypto.so. This
is because the liboemcrypto.so tries to load in libQSEEComAPI.so, which
some devices contain both a 32-bit and 64-bit version of. Since we set
the LD_LIBRARY_PATH to use /vendor/lib64 first, and since we only have a
32-bit liboemcrypto.so, the 32-bit liboemcrypto.so will try to load in the
libQSEEComAPI.so in the lib64 path first. Since the liboemcrypto.so is
32-bit, it will fail to open the 64-bit library. The solution to this is
to conditionally set the LD_LIBRARY_PATH based on if a 64-bit
liboemcrypto.so exists or not.
Change-Id: I80a9e778f31f089f66df0544cb022d810e9d3de3
2019-05-24 10:30:10 -07:00
Haibo Huang
6f1910ec4c
Using ::testing::DoAll am: c70771dd20
...
am: 1fd42b9c8c
2019-05-23 01:31:59 -07:00
Haibo Huang
0222e219f6
Merge "Using ::testing::DoAll" into qt-dev-plus-aosp
...
am: f078443fd7
2019-05-22 14:04:28 -07:00
Haibo Huang
1fd42b9c8c
Using ::testing::DoAll
...
am: c70771dd20
2019-05-22 13:26:49 -07:00
Haibo Huang
f078443fd7
Merge "Using ::testing::DoAll" into qt-dev-plus-aosp
2019-05-22 17:43:01 +00:00
Haibo Huang
e3e086e3f8
Using ::testing::DoAll
...
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I9eb7b7a2634f20ef80a23b75c06fc84a2fa52dc3
(cherry picked from commit 9055e93a70
2019-05-22 17:38:58 +00:00
Haibo Huang
c70771dd20
Using ::testing::DoAll
...
[ Merge of ag/7620084 ]
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I5e3f5310617e00821f70079fc700bc3f87c3d0ab
(cherry picked from commit 5764d3f801
2019-05-22 17:27:03 +00:00
Rahul Frias
9900ce909b
Merge "Ref count WvCdmDecryptionModule"
2019-05-22 14:28:02 +00:00
Fred Gylys-Colwell
aa7f7d3ac4
Remove test keybox one more time
...
Merge from Widevine repo of http://go/wvgerrit/78883
Bug: 119316243
Test: unit tests
Change-Id: Ic6748a6e020c2a4058510fb5c6c5a821e57cc5fd
2019-05-22 00:25:56 +00:00
Rahul Frias
776996d6d2
Ref count WvCdmDecryptionModule
...
[ Merge of http://go/wvgerrit/78803 ]
WvCdmDecryptionModule needs to be refcounted since it inherits
from RefBase. The test code instantiates it as a member variable.
Bug: 133188706
Test: WV unit/integration tests
Change-Id: Ib41f3477a55923fb4cc26472e42d3e18eb2b84d4
2019-05-21 11:41:52 -07:00
Haibo Huang
5764d3f801
Using ::testing::DoAll
...
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I5e3f5310617e00821f70079fc700bc3f87c3d0ab
2019-05-20 11:19:06 -07:00
Haibo Huang
c19f8867c0
Merge "Using ::testing::DoAll"
2019-05-20 00:19:13 +00:00
Haibo Huang
9055e93a70
Using ::testing::DoAll
...
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I9eb7b7a2634f20ef80a23b75c06fc84a2fa52dc3
2019-05-20 00:18:22 +00:00
Rahul Frias
55e54caca5
Merge "Merge "Correct android version number in test" into qt-dev am: 48650f74ab am: df19f4f85d" into qt-r1-dev-plus-aosp
...
am: 5cbcb9eba0
2019-05-18 04:42:39 -07:00
Rahul Frias
1ae3ff21e8
Merge "Correct android version number in test" into qt-dev am: 48650f74ab am: 5b3a43b17c
...
am: 766a15693a
2019-05-18 04:00:21 -07:00
Fred Gylys-Colwell
e2a2dcf763
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e am: af4ba75658
...
am: b85766a7f0
2019-05-17 23:27:13 -07:00
Fred Gylys-Colwell
b56e01cd2f
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e am: d579bbf511
...
am: 5a9ef9a128
2019-05-17 14:19:57 -07:00
Android Build Merger (Role)
5cbcb9eba0
Merge "Merge "Correct android version number in test" into qt-dev am: 48650f74ab am: df19f4f85d" into qt-r1-dev-plus-aosp
2019-05-17 14:41:31 +00:00
Rahul Frias
ed587da19c
Merge "Correct android version number in test" into qt-dev am: 48650f74ab
...
am: df19f4f85d
2019-05-17 07:41:23 -07:00
Rahul Frias
766a15693a
Merge "Correct android version number in test" into qt-dev am: 48650f74ab
...
am: 5b3a43b17c
2019-05-17 07:41:18 -07:00
Rahul Frias
5b3a43b17c
Merge "Correct android version number in test" into qt-dev
...
am: 48650f74ab
2019-05-17 07:38:18 -07:00
Rahul Frias
df19f4f85d
Merge "Correct android version number in test" into qt-dev
...
am: 48650f74ab
2019-05-17 07:36:16 -07:00
Rahul Frias
48650f74ab
Merge "Correct android version number in test" into qt-dev
2019-05-17 14:23:01 +00:00
Robert Shih
860d3ef467
Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca am: 790b97e308
...
am: e91e7142ae
2019-05-17 00:15:49 -07:00
Robert Shih
fe8924f814
Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca am: 6a329e6c9a
...
am: e6ba3ec747
2019-05-16 20:07:33 -07:00
Fred Gylys-Colwell
f3b65702ca
Merge "Address review comments for OEMCrypto Build Information"
2019-05-17 01:19:56 +00:00
Fred Gylys-Colwell
b85766a7f0
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e
...
am: af4ba75658
2019-05-16 17:45:51 -07:00
Fred Gylys-Colwell
5a9ef9a128
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e
...
am: d579bbf511
2019-05-16 17:23:18 -07:00
Fred Gylys-Colwell
af4ba75658
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev
...
am: 3454ccf51e
2019-05-16 15:43:59 -07:00
Fred Gylys-Colwell
d579bbf511
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev
...
am: 3454ccf51e
2019-05-16 15:34:06 -07:00
Rahul Frias
4f273991b9
Correct android version number in test
...
[ Merge of http://go/wvgerrit/79144 ]
Bug: 132908020
Test: WV unit/integration tests
Change-Id: Idf5cf3e1e886af3bfed157320fa09d66dfa55c0d
2019-05-16 14:44:40 -07:00
TreeHugger Robot
3454ccf51e
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev
2019-05-16 20:34:18 +00:00
Fred Gylys-Colwell
e4c7bc38f8
Address review comments for OEMCrypto Build Information
...
Merge of http://go/wvgerrit/78683
There were some review comments in http://go/wvgerrit/78683 that came
in after the code was merged to the qt-dev branch. This CL addresses
them on the master branch.
Test: unit tests.
Bug: 129070445
2019-05-16 18:32:16 +00:00
Robert Shih
e91e7142ae
Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca
...
am: 790b97e308
2019-05-16 07:15:25 -07:00
Robert Shih
e6ba3ec747
Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca
...
am: 6a329e6c9a
2019-05-15 22:41:49 -07:00
Robert Shih
790b97e308
Add CdmKeyStatus kKeyStatusUsableInFuture
...
am: 69c8f488ca
2019-05-15 18:32:40 -07:00
Robert Shih
6a329e6c9a
Add CdmKeyStatus kKeyStatusUsableInFuture
...
am: 69c8f488ca
2019-05-15 18:32:20 -07:00
Srujan Gaddam
fa60c58344
Merge "Update Level 3 to OEMCrypto v15.2"
2019-05-15 22:49:21 +00:00
Robert Shih
69c8f488ca
Add CdmKeyStatus kKeyStatusUsableInFuture
...
Bug: 116738851
Test: unit tests
Change-Id: I49728788e57905806b72e891f3654fbf0c8b1bc0
2019-05-15 15:16:05 -07:00
Fred Gylys-Colwell
29becbc2bf
Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15
...
Merge from Widevine repo of http://go/wvgerrit/78949
LoadKeyWithSuspiciousIV is a new test for OEMCrypto v15.2. It is
being disabled since we do not require 15.2 for the Q release.
SelectKeyNotThereAPI15 was failing because the error code is
delayed. This is acceptable.
Bug: 132720732
Test: unit tests on taimen
Change-Id: Iea3fabfb3afd800065119ce812fb454be1e82644
2019-05-14 22:32:54 -07:00
Fred Gylys-Colwell
567acef45c
Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev am: 127f87770c
...
am: 770212b178
2019-05-14 18:01:12 -07:00
Fred Gylys-Colwell
843c8ab83a
Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev am: 127f87770c am: e4eef77a01
...
am: 8a104ddc65
2019-05-14 16:56:10 -07:00
Rahul Frias
f5fc017e78
Merge "Ref count Timer implementation" into qt-dev am: ed833222a6
...
am: 112fd43208
2019-05-14 16:54:13 -07:00
Rahul Frias
06e65fc383
Merge "Single PSSH entitlement handling" into qt-dev am: 19c6e57269
...
am: f9f9aef3b9
2019-05-14 16:52:24 -07:00
Rahul Frias
ada42ea839
Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad
...
am: ba774bcc0b
2019-05-14 16:50:40 -07:00
Fred Gylys-Colwell
2381f9b187
Report OEMCrypto Build Information in License Request am: 5ee5d00514
...
am: 1b766afb51
2019-05-14 16:47:05 -07:00
