Commit Graph

2301 Commits

Author SHA1 Message Date
Scott Randolph
cfcb558328 Use explicit .c_str() for hidl_string am: cfcdceaa4f
am: 6a7f774237

Change-Id: Id0b3e3e0b75df29c0ed89a38fef03ea7edaffe6c
2017-04-06 20:10:06 +00:00
Jeff Tinker
26b8cac44e Merge "Add additional VTS drm tests for widevine" into oc-dev
am: 70d15e286f

Change-Id: Id5c0ec26a22ca570932a571243bb552fe24fd898
2017-04-06 18:30:16 +00:00
TreeHugger Robot
70d15e286f Merge "Add additional VTS drm tests for widevine" into oc-dev 2017-04-06 18:20:59 +00:00
Scott Randolph
6a7f774237 Use explicit .c_str() for hidl_string
am: cfcdceaa4f

Change-Id: Ief21c8e31a1bbd3e389f70a0c9cfe0b837aece35
2017-04-06 18:14:18 +00:00
Scott Randolph
cfcdceaa4f Use explicit .c_str() for hidl_string
hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class.  It now emulated
std::string in requiring a call to .c_str() to get the same behavior.

Bug:  36532780
Test:  Build the tree
Change-Id: I2ce4354619a99d7c5ae8b39762d5506891ccd1ed
2017-04-06 10:58:56 -07:00
Edwin Wong
542ed59773 Merge "Remove dependencies from frameworks C++ containers." into oc-dev am: 72f89a3b7f
am: c719a091fd

Change-Id: I85f0358f11cceb9b41d51bcbacb512adec097de5
2017-04-06 04:25:30 +00:00
Edwin Wong
c719a091fd Merge "Remove dependencies from frameworks C++ containers." into oc-dev
am: 72f89a3b7f

Change-Id: I3904d885c7e8cb45adb5ec3b57921533788871d1
2017-04-06 04:21:57 +00:00
Edwin Wong
72f89a3b7f Merge "Remove dependencies from frameworks C++ containers." into oc-dev 2017-04-06 04:18:27 +00:00
Thierry Strudel
f94a1a6c43 service.widevine: Define LOCAL_MODULE_OWNER
AOSP builds enforces that all vendor modules has a defined owner.

Change-Id: I7bb5d9e092b879cbce88a009f5f5d4b4d587e07d
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2017-04-05 21:17:58 -07:00
Jeff Tinker
8fa257a8f5 Merge "Fix compiler warnings" into oc-dev am: 8e041f9fd3
am: 8e3e85f4ce

Change-Id: I0e26f3bdf04eb080288a3b3d9c283f77dbef23a1
2017-04-06 00:41:50 +00:00
Jeff Tinker
8e3e85f4ce Merge "Fix compiler warnings" into oc-dev
am: 8e041f9fd3

Change-Id: I58aaf075db987532c210f4d46d21ef84b20b7273
2017-04-06 00:31:19 +00:00
TreeHugger Robot
8e041f9fd3 Merge "Fix compiler warnings" into oc-dev 2017-04-06 00:19:38 +00:00
Edwin Wong
d9e7070de7 Remove dependencies from frameworks C++ containers.
Replace AString, KeyedVector, List, String8 and Vector
with stl containers. Remove corresponding frameworks
libraries.

Test: Play Movies & TV (streaming and pinning)
Test: Netflix
Test: unit tests

bug: 34677927
Change-Id: I125f45054987d69bbca59c1ffdcbe8add38c3c13
2017-04-05 22:46:04 +00:00
Jeff Tinker
cfe80bc234 Add additional VTS drm tests for widevine
Also fixes a few cases where invalid inputs were
not checked.

bug: 34178477
Change-Id: I15c1e5f96e0843f484d8d3e29f548eac30d9dd80
2017-04-04 22:38:55 -07:00
Ryan Campbell
8558c86cbf Merge "Build libvtswidevine to relative directory." into oc-dev am: 82a0ed59fe
am: f5da7b9786

Change-Id: Id6323682562ec2891047d0c9a570bf4bcf370ed0
2017-04-04 23:14:21 +00:00
Ryan Campbell
f5da7b9786 Merge "Build libvtswidevine to relative directory." into oc-dev
am: 82a0ed59fe

Change-Id: Ie4df8154a9cf9f0f652c5302e9784cc7fd740f30
2017-04-04 23:12:22 +00:00
TreeHugger Robot
82a0ed59fe Merge "Build libvtswidevine to relative directory." into oc-dev 2017-04-04 23:05:29 +00:00
Ryan Campbell
cdaeb0716c Build libvtswidevine to relative directory.
Build libvtswidevine module relative to the directory
drm-vts-test-libs.

Test: make vts; libvtswidevine.so is in correct place.
Bug: 36889176
Bug: 36817233
Change-Id: Iadb5bd6e71a1a7c99a69feff2ecb7bded90af24d
2017-04-04 13:26:01 -07:00
Fred Gylys-Colwell
d0a3568338 Address merge comments
Merge from Widevine repo of http://go/wvgerrit/24723

Several review comments were uncovered in the merge from oc-dev to
master. This CL addresses them.  This is just style changes in test
code.

http://go/wvgerrit/24318
http://go/wvgerrit/24301
http://go/wvgerrit/24316

Test: ran unit tests.

b/36451451

Change-Id: I257f8bf9b4fb5797e3da69578b48cd040cf61bfb
2017-04-04 12:31:59 -07:00
John W. Bruce
4ca95e0b53 Turn on 64-bit Executables on Supported Platforms am: b99a4c736f
am: d4598279aa

Change-Id: I5570b430a4b492b383b551d41b3b181f447c3146
2017-04-02 05:32:34 +00:00
John W. Bruce
d4598279aa Turn on 64-bit Executables on Supported Platforms
am: b99a4c736f

Change-Id: I83842ffe27dc049dd32a4b4351b7ae21a14968e7
2017-04-02 05:29:34 +00:00
John W. Bruce
b99a4c736f Turn on 64-bit Executables on Supported Platforms
This commit changes the unit tests and HAL Service to run as 64-bit on
devices that have enabled 64-bit DRM Plugins.

Bug: 36076017
Test: Turned on the flag for a device and used the file command to
      verify that all binaries were built as 64-bit.
Test: Turned the flag back off and verified that all binaries were built
      as 32-bit. This should affect no current devices.
Change-Id: Ieb7218f15b9359f2038a6f60b8c994b16d2b5b53
2017-04-01 19:05:30 -07:00
Jeff Tinker
749ce0efcf Fix compiler warnings
Formats for size_t were incorrect

Change-Id: Ibdfdd734b9fe9e74e014fe10152ad8b9baf2d6f2
2017-03-31 16:19:41 -07:00
Jeff Tinker
3f82e2d60c Merge "Add checks for invalid parameters" into oc-dev am: b3ea54b6dc
am: 85619457ac

Change-Id: Icfe16fcd561cd7b72752219e51c5fee499ac276d
2017-03-31 05:35:51 +00:00
Jeff Tinker
e67de219e7 Merge "DRM VTS Vendor module for widevine" into oc-dev am: 2b49e7c4ec
am: c11698cd48

Change-Id: Iaba0f4bf9f47e32dcc2f821a4569f3e83588ad7c
2017-03-31 05:35:49 +00:00
Jeff Tinker
85619457ac Merge "Add checks for invalid parameters" into oc-dev
am: b3ea54b6dc

Change-Id: I6132060ba0e1dd7d77834df95896861594ea3232
2017-03-31 05:33:24 +00:00
Jeff Tinker
c11698cd48 Merge "DRM VTS Vendor module for widevine" into oc-dev
am: 2b49e7c4ec

Change-Id: I90d94e3a306a9c6da1e15b38798fd94d03d4be76
2017-03-31 05:33:22 +00:00
TreeHugger Robot
b3ea54b6dc Merge "Add checks for invalid parameters" into oc-dev 2017-03-31 05:29:54 +00:00
TreeHugger Robot
2b49e7c4ec Merge "DRM VTS Vendor module for widevine" into oc-dev 2017-03-31 05:29:54 +00:00
John Bruce
905ff26b61 Merge "Fix & Improve Test-Building and -Running Scripts" into oc-dev am: 0fba3719e7
am: fb20fb9c69

Change-Id: I1f627843302461dcdedf07b31f22690d4cf293d9
2017-03-31 01:25:34 +00:00
John Bruce
fb20fb9c69 Merge "Fix & Improve Test-Building and -Running Scripts" into oc-dev
am: 0fba3719e7

Change-Id: I47dc5a5f08f133a18516e5cdf09ad361ef9783b5
2017-03-31 01:06:14 +00:00
John Bruce
0fba3719e7 Merge "Fix & Improve Test-Building and -Running Scripts" into oc-dev 2017-03-31 00:56:55 +00:00
Jeff Tinker
76f43abcbe Add checks for invalid parameters
Part of VTS test suite validation

related-to-bug: 32815560

Test: drm hal vts test
Change-Id: I52be29cd46f535482a761f98acf6ff28870c061c
2017-03-30 16:15:01 -07:00
Jeff Tinker
01cb3cb787 DRM VTS Vendor module for widevine
This module is used with the drm VTS tests as part of HIDL/HAL
testing.  For background reference:
hardware/interfaces/drm/1.0/vts/doc/Drm_Vendor_Modules_v1.pdf

Change-Id: I38eb13696343e08fa2a1758219350d25698bfb7d
related-to-bug: 32815560
2017-03-30 23:07:11 +00:00
John W. Bruce
f2463075ac Fix & Improve Test-Building and -Running Scripts
(This is a merge of wvgerrit/24922)

This contains several fixes and improvements to the
build_and_run_all_unit_tests.sh and run_all_unit_tests.sh scripts:

* All tests are now identified as vendor binaries and thus are stored in
  the /vendor/bin/ directory instead of /system/bin/. Previously, some
  tests had moved to /vendor/bin/ but the scripts had not been updated,
  causing these tests to fail to run.
* The -j parameter can now be passed to build_and_run_all_unit_tests.sh,
  for those who want to speed up their build by using multiple cores.
* The 64-bit library directories are now added to the library search
  path, in anticipation of devices with 64-bit DRM Plugins.
* Checking for Verity protection is now done in
  build_and_run_all_unit_tests.sh (which is the script that actually
  modifies the file system) instead of just in run_all_unit_tests.sh.
* The library search path is no longer set unnecessarily for
  libwvdrmengine_hidl_test.
* The Treble-only tests and non-Treble-only tests now only run on
  devices that meet their respective criteria.

Bug: 36071236
Test: Ran build_and_run_all_unit_tests.sh
Change-Id: Iea236880c4445858111c801dfa278a528bca0f6c
2017-03-29 19:01:04 -07:00
Edwin Wong
6d766843ad Fix testOEMCryptoVersion am: 957d4a30dd
am: e59918c8b1

Change-Id: If1d42fbfe00041bd1fa33f012f1d4260e0681aaf
2017-03-30 01:32:09 +00:00
Edwin Wong
e59918c8b1 Fix testOEMCryptoVersion
am: 957d4a30dd

Change-Id: Ia2f9f78ff0741bcb7c7ecd8c348aff0736004050
2017-03-30 01:27:20 +00:00
Edwin Wong
957d4a30dd Fix testOEMCryptoVersion
Merge from go/wvgerrit/24882:

The result of crypto_session.GetApiVersion is misinterpreted.

Test: ANDROID_BUILD_TOP= -gts/tools/gts-tradefed run gts
 -m GtsMediaTestCases --test com.google.android.media.gts.
 MediaDrmTest#testOemCryptoVersion

Test: ANDROID_BUILD_TOP= -gts/tools/gts-tradefed run gts
 -m GtsMediaTestCases --test com.google.android.media.gts.
 MediaDrmTest

bug: 36728950
Change-Id: I72a05608f778fa81689013d3b231010b71329ea1
2017-03-29 15:49:59 -07:00
Fred Gylys-Colwell
7f513669a3 Merge "Disable new unit tests for old oemcrypto" into oc-dev am: 92dff24180
am: dd8979b247

Change-Id: I417835c6ea5a0b386f906004ea67c2504c50193d
2017-03-29 20:37:39 +00:00
Fred Gylys-Colwell
dd8979b247 Merge "Disable new unit tests for old oemcrypto" into oc-dev
am: 92dff24180

Change-Id: I26f0e27ef503199c679548fd08780e3ebf191a4b
2017-03-29 20:31:28 +00:00
Fred Gylys-Colwell
92dff24180 Merge "Disable new unit tests for old oemcrypto" into oc-dev 2017-03-29 20:22:23 +00:00
Edwin Wong
dc5d72f5e9 Widevine HAL must not access mediametrics binder service. am: 54061a8bb8
am: 03b51678f5

Change-Id: I1e94573ce0910e66a817a2747acfa1143c3733a1
2017-03-29 06:15:42 +00:00
Edwin Wong
03b51678f5 Widevine HAL must not access mediametrics binder service.
am: 54061a8bb8

Change-Id: I3832883c9c20ae248b4501e12b4586f193f60c71
2017-03-29 06:13:09 +00:00
Edwin Wong
54061a8bb8 Widevine HAL must not access mediametrics binder service.
Widevine HAL is not part of framework/system image and thus it is not
permitted to use Binder. Binder-like mechanisms which are permitted are
HwBinder  or VendorBinder (for communications only with vendor image
components).

Remove references to MediaAnalyticsItems used by ami_adapter.*.

Test: Play Movies & TV (streaming and pinned content)
Test: Netflix
Test: Widevine unit tests

bug: 36576915
Change-Id: I786f206c01d7c5ebfce719f3f51f5f7927f0359e
2017-03-28 14:24:02 -07:00
Fred Gylys-Colwell
17da2fbfdd Disable new unit tests for old oemcrypto
Merge from Widevine repo of http://go/wvgerrit/24863

The oemcrypto unit tests GenericKeyDecryptSameBuffer and
GenericKeyDecryptSameBuffer require features in oemcrypto v12, so they
should not be run on devices that report oemcrypto v11 or earlier.

b/36071236

Test: Unit tests run on Ryu and Bullhead.
Change-Id: Ia6645559ed98cae8d9807a14d6f0e514c5c4c615
2017-03-28 13:29:01 -07:00
John W. Bruce
bfe6046199 Build Android Unit Tests 32-bit Only
(This is a merge of http://go/wvgerrit/24738)

The change to enable 64-bit as a possible target for Widevine Android
made all the unit tests build as 64-bit on compatible platforms. Since
none of these devices support 64-bit properly yet, this is a mistake.
This patch restores unit test builds to being 32-bit only for now.

In the future, when the switch for 64-bit-supporting devices is added,
it will also switch the unit tests to 64-bit mode.

Bug: 36071236
Test: Verified unit test format with "file" command.
Change-Id: Ib4d3678181f3221b85fe6409f1d842dd15af3daa
2017-03-23 17:09:15 -07:00
TreeHugger Robot
99566d48e9 Merge "Clean Up Warnings in Android Glue Code" 2017-03-23 19:52:49 +00:00
Fred Gylys-Colwell
85365a1497 Fix or ignore compiler warnings
Merge from Widevine repo of http://go/wvgerrit/24688

b/35466719

Change-Id: If89f0cad0c61f37536a84f8dadaf08072356343a
2017-03-22 14:07:08 -07:00
John W. Bruce
92d26ff87e Clean Up Warnings in Android Glue Code
(This is a merge of go/wvgerrit/24739)

This cleans up some warnings in the Android glue code:

1) Checking if unsigned values are >= 0.
2) Using {0} initializer syntax instead of fully expanding to {0,0}.

Bug: 34394125
Test: Verified compilation passes
Change-Id: Id59730b97da7fce320f634451a44a4df4bf0b494
2017-03-22 11:08:32 -07:00
Edwin Wong
c4aad89fd0 Rename libhidl_utils to libwidevinehidl_utils.
This library is local to vendor/widevine HAL service, rename to
indicate this is used only by widevine HAL.

Test: Play Movies & TV (streaming and pinned)

Test: Netflix

bug: 36430909
Change-Id: Iacaf78f4223bf305569e7f1d04dd4e4ad0a87727
2017-03-20 11:14:36 -07:00