Commit graph

118 commits

Author SHA1 Message Date
TreeHugger Robot
ed827b8210 Merge "Drm test static links to HAL def libs." into oc-mr1-dev 2017-08-24 21:54:47 +00:00
Tri Vo
78e8902160 Drm test static links to HAL def libs.
Bug: 64040096
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check 
--skip-preconditions --module VtsHalDrmV1_0Target
Change-Id: If23f1fda06e9188b84fc94ada0e22ca7e5b45aa9
2017-08-22 16:10:27 +00:00
Jeff Tinker
8813c2b43f Allow clearkey tests to run if no vendor modules am: 5db2e67293
am: 66812dc364

Change-Id: I6369dd486c35c842c1d0f1f151b3b468ef94ab4c
2017-08-18 04:13:04 +00:00
Jeff Tinker
66812dc364 Allow clearkey tests to run if no vendor modules
am: 5db2e67293

Change-Id: I594b8b5e9857d4a6c19d0847acf7c13949e13614
2017-08-18 04:07:04 +00:00
Jeff Tinker
5db2e67293 Allow clearkey tests to run if no vendor modules
DRM cannot skip all tests when vendor modules are
not present. Currently even the clearkey tests are
skipping when there is no vendor lib. This can be
replicated by just pushing the DRM VTS test binary
build from master (or DR or MR) and executing the
binary without VTS. All test cases skip (including
clearkey).

This change prevents exiting when no vendor
modules are found.

Test: Push the test binary and confirm that the
clearkey tests run.

bug:64459011
Change-Id: Ic5f554d9b223d6ca4bf26f92f072254cc18f4620
2017-08-17 17:39:19 +00:00
Edwin Wong
111848cbd0 Add test for additional ClearKey UUID.
Test for both ClearKey plugin UUIDs in DrmHalClearkeyFactoryTest.

Test: VTS - VtsHalDrmV1_0TargetTest

bug: 64386897
Change-Id: Id7f140518910a87efdf9eaa19ce16113e206264f
2017-08-08 15:46:15 -07:00
TreeHugger Robot
8e9eed3376 Merge "Remove unused variables." into oc-mr1-dev 2017-08-07 23:51:34 +00:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Tri Vo
8da14867cf Remove unused variables.
Test: compiles
Change-Id: Idf7631f98ad4e04f4a43e66161ba27e93d180241
2017-08-03 17:32:26 -07:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Edwin Wong
3b8a9ed510 Check for nullptr IMemory.
mapMemory can return a nullptr, must check for nullptr
IMemory.

Test: Play Movies (stream and pin movies)
Test: VtsHalDrmV1_0TargetTest

bug: 38386082
Change-Id: I0766380a5843415ef0260c26bd21d4b4051b20ea
2017-07-18 10:45:16 -07:00
Jiyong Park
323d172db7 Build android.hardware.drm@1.0-service with BOARD_VNDK_VERSION
Instead of relying on the global include paths, use the new headers lib
'media_plugin_headers'. Also, media/SharedLibrary.h is not used, thus deleted.

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j android.hardware.drm@1.0-service
Change-Id: I30d8bcb6315b734cef7ad082c432da51eb33119c
2017-07-03 18:16:04 +09:00
Yahan Zhou
b95c8638c1 Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17
am: ef38715ba3

Change-Id: Iebc7405f6603c2838ecaa917357eb81a977f140c
2017-06-28 17:33:39 +00:00
Yahan Zhou
bd0c79c262 Merge "Fix ICryptoFactory service" into oc-dev
am: 2c57b00b17

Change-Id: If739ab2d5a5c93ddd2bb8720305311ee49a5503d
2017-06-28 17:30:40 +00:00
Yahan Zhou
ef38715ba3 Merge "Fix ICryptoFactory service" into oc-dev
am: 2c57b00b17

Change-Id: I81cb1a353e63fea48f69e2fc522f70b63a1e8532
2017-06-28 17:30:40 +00:00
Steven Moreland
c019787ce9 Use vendor variant of libstagefright_foundation.
Rather than having a lib called libstagefright_foundation and one
called libstagefright_foundation_vendor, we now just have one library
and the build system keeps track of the vendor APIs that are exposed.

Test: (sanity) boot device, watch (part of) DRM protected movie.
Change-Id: I7495be3e8f546cac1b4909108313cf61fc85b1d8
2017-06-22 17:11:09 -07:00
Yahan Zhou
ccc11be665 Fix ICryptoFactory service
BUG: 62642564
BUG: 62138343

Test: vts -m VtsHalDrmV1_0Target

Change-Id: Ic697a32b111804fc3dc78f1b6e6b77538d7eeea9
(cherry picked from commit 85a5d8855b07aec3727532983de38c324960d6d1)
2017-06-22 17:29:08 +00:00
Martijn Coenen
14adc6ebc0 Make camera/drm helper classes available to system.
As VTS tests are considered system and link against these.

Bug: 38302533
Bug: 62523241
Test: builds
Change-Id: Iac5c872c58ec9646d6d6974aacceb930daad7e5e
2017-06-20 08:57:46 -07:00
Jiyong Park
07770c78e1 Remove dependency to libmediadrm from drm HAL
drm HAL has been using libmediadrm for android::SharedLibrary class and
android::PluginLoader class. This is a Treble violation since
libmediadrm is a framework-only library that is not available to
vendors.

To solve the problem, the two classes are copied into this directory
to form a small static library android.hardware.drm@1.0-helper.a.

Bug: 38302533
Test: mm under /hardware/interfaces/drm/1.0/default and
/hardware/interfaces/drm/1.0/vts/functional

Change-Id: I7b4e5cdb3bc815e971e0c3b7ec99ea86042e13eb
2017-06-20 12:32:28 +09:00
Jiyong Park
eb845dab6e Use libstagefright_foundation_vendor
DRM HAL is a library in vendor. When BOARD_VNDK_VERSION is turned
on, any lib in vendor partition can only link against to other vendor
libs or libs marked as vendor_available:true. This lib is using
libstagefright_foundation and the lib is not available to vendors.
Instead, libstagefright_foundation_vendor is provided as a
vendor-variant of the foundation library. Thus switching to the vendor
variant.

Bug: 37462569
Test: m android.hardware.drm@1.0-impl
Change-Id: Iaee9886f9ba3643e1c19928690bad13c26ac29d7
2017-06-19 19:14:46 +00:00
Steven Moreland
7708449766 Update makefiles. (2/2) am: 76cfb84140
am: f203167814

Change-Id: I1f13401266f3c2f78c627088b09c79cd7c8d0276
2017-05-22 17:29:04 +00:00
Steven Moreland
f203167814 Update makefiles. (2/2)
am: 76cfb84140

Change-Id: I24d21438a5b2f447d2160929c6ff6e17b2b66820
2017-05-22 17:15:20 +00:00
Steven Moreland
76cfb84140 Update makefiles. (2/2)
Adds default configuration for all hals.

Bug: 38415912
Test: pass
Change-Id: Idd1f3a2b7b16ad956d31784a513e93a066cdd02e
2017-05-19 15:54:03 -07:00
Jeff Tinker
7a0385c44a Merge "Revert "Fix resource leaks in drm hal"" into oc-dev am: db15c4b6ee
am: ddd1c63569

Change-Id: Iab79f9667ed22427c11e133da60b3371723239bb
2017-05-16 19:33:23 +00:00
Jeff Tinker
ddd1c63569 Merge "Revert "Fix resource leaks in drm hal"" into oc-dev
am: db15c4b6ee

Change-Id: Ib2b3078f95637fe3c4f4f6e0bd73498374f945f5
2017-05-16 18:50:29 +00:00
Jeff Tinker
db15c4b6ee Merge "Revert "Fix resource leaks in drm hal"" into oc-dev 2017-05-16 18:25:51 +00:00
Jeff Tinker
e3b6ae14f5 Revert "Fix resource leaks in drm hal"
This caused b/38343526 which is a chase list issue, reverting for now.

This reverts commit 4e1fe736af.

Change-Id: Ib9ffcd11e575e3f05f54cbea17fda2f2eb3780b5
2017-05-16 18:21:39 +00:00
Jeff Tinker
24401aac69 Merge "Fix resource leaks in drm hal" into oc-dev am: 14b91049a7
am: fbe6eee2e5

Change-Id: Ied6aca47ea624dad2ae7778b4e70397dfaf02a4f
2017-05-15 20:14:20 +00:00
Jeff Tinker
fbe6eee2e5 Merge "Fix resource leaks in drm hal" into oc-dev
am: 14b91049a7

Change-Id: Iedefddb99f498e968a22b50fe09c589f43907ff6
2017-05-15 20:03:22 +00:00
TreeHugger Robot
14b91049a7 Merge "Fix resource leaks in drm hal" into oc-dev 2017-05-15 19:54:16 +00:00
Steven Moreland
d09cf863da Update makefiles for c++-sources and c++-headers. (2/2) am: bc71124120
am: a32ebce372

Change-Id: Ic1dd8f98e72656bc12a6e5224e541f75afb79daa
2017-05-11 01:38:14 +00:00
Steven Moreland
a32ebce372 Update makefiles for c++-sources and c++-headers. (2/2)
am: bc71124120

Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Steven Moreland
bc71124120 Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Jeff Tinker
4e1fe736af Fix resource leaks in drm hal
bug:36408047
test: manual tests to verify leaks are fixed
Change-Id: Idd79e99e211d81f8b3e58cf52c9b01ce9d370dc4
2017-05-09 11:24:49 -07:00
Steven Moreland
5c63b11f76 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
Steven Moreland
2cd0d42d72 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 10:17:28 -07:00
John W. Bruce
f3bffa8ef3 Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev am: 3fec5a6498
am: 3b361d8548

Change-Id: I717ef249e77045bb51a8d39fc20bf35850300f28
2017-04-29 00:01:51 +00:00
John W. Bruce
467c0db62c Prefix ENABLE_MEDIADRM_64 with TARGET_
This build-time flag should be prefixed.

Bug: 37039525
Test: Built OS
Change-Id: If6f6cd1ad2df5f000a4264cabeb7d9eb77e194ea
2017-04-27 18:50:05 -07:00
Jeff Tinker
3b65eae2fc Merge "Fix VtsHalDrmV1_0Target test failure" into oc-dev am: 1fd47b29b3
am: e126cf8cc1

Change-Id: I47ee7ecc392a88e0f4ac3ea570e5a55947be9f09
2017-04-25 22:18:06 +00:00
Jeff Tinker
a33256b811 Fix VtsHalDrmV1_0Target test failure
DrmHalVendorFactoryTest.EmptyPluginUUIDNotSupported
was failing on 64 bit builds. The test was using
an uninitialized hidl_array as the empty UUID which
was incorrect. This change initializes the array
contents to null values.

Test: drm hal tests pass

bug: 37172151
Change-Id: I0acb86921f0daceba30fa7879980ce819db64a74
2017-04-24 17:02:17 -07:00
Jeff Tinker
725771fdc4 Merge "VtsHalDrmV1_0Target test failure" into oc-dev am: c68698337c
am: bb68f35c9b

Change-Id: I05fd10acd902c70140a3acaec6096419f17159dc
2017-04-15 08:02:32 +00:00
TreeHugger Robot
c68698337c Merge "VtsHalDrmV1_0Target test failure" into oc-dev 2017-04-15 07:53:27 +00:00
Jeff Tinker
bb2223efe8 Merge "Skip tests when the drm scheme is not installed" into oc-dev am: fdde895c34
am: 09e8fb099d

Change-Id: I2f1ff0469264c3611ab6e19d3b69a3b9d9c0f659
2017-04-15 00:12:26 +00:00
Jeff Tinker
fdde895c34 Merge "Skip tests when the drm scheme is not installed" into oc-dev 2017-04-14 23:41:49 +00:00
Jeff Tinker
779678f559 VtsHalDrmV1_0Target test failure
The DrmHalVendorPluginTest.RestoreKeysClosedSession test wasn't
taking into account the policy of the asset, so both streaming
and offline assets were included in the test which is incorrect.

Test: drm vts test passes

bug:37358379
Change-Id: I41116e77a1ae306bb1a484e3714360c8553590f0
2017-04-14 16:13:19 -07:00
Ryan Campbell
d17815c4e3 Merge "Add testcases for restoreKeys API." into oc-dev am: 007d23e7cb
am: 3b1bb60add

Change-Id: I25d4d2a54ec29c1f44b5a5d020b33510939ca49b
2017-04-14 21:47:21 +00:00
TreeHugger Robot
007d23e7cb Merge "Add testcases for restoreKeys API." into oc-dev 2017-04-14 21:38:30 +00:00
Jeff Tinker
be310b2b77 Skip tests when the drm scheme is not installed
Not all drm hal implmentations will be present on every device,
but the vendor modules will be. This change allows tests to be skipped
when a drm hal implementation isn't present.

Test: drm vts tests pass with widevine on a gms
device (tests executed) and tests pass on an aosp
device (tests skipped).

Change-Id: I0b87f501a45103960193279eb5b4b2cd1c113acd
2017-04-14 13:28:32 -07:00
Iliyan Malchev
a5a5bce644 Merge "Route DRM HAL libbinder traffic to /dev/vndbinder" into oc-dev am: 580125c253
am: ef983f7ae1

Change-Id: Ic59d7d2d834814fdc3b7378155603b2537e2a357
2017-04-14 18:45:06 +00:00
Iliyan Malchev
136b5e46ec Route DRM HAL libbinder traffic to /dev/vndbinder
b/37309712
Test: marlin

Change-Id: I72c2304842bd21b5393c17be5beeeb90a74d5345
Signed-off-by: Iliyan Malchev <malchev@google.com>
2017-04-14 15:25:16 +00:00