Commit graph

134 commits

Author SHA1 Message Date
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Treehugger Robot
988c977079 Merge "Update for hidl adapter module defaults." 2017-10-04 21:36:25 +00:00
Chih-hung Hsieh
3ed04cd35d Merge "Use -Werror in hardware/interfaces"
am: 85bb01dd6b

Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
2017-10-04 20:40:30 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Chih-Hung Hsieh
3da5b01946 Use -Werror in hardware/interfaces
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
2017-10-04 11:16:31 -07:00
Edwin Wong
cd6c66c430 Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev
am: d85a098767

Change-Id: I29d4ea563a7d855bfd07c4624faf0d89577d6515
2017-10-04 16:42:47 +00:00
Edwin Wong
48311a8c27 Fix VtsHalDrmV1_0Target clearkey tests.
1. Fix the following issues:
  - queryKeyStatus is now implemented, do not return
    ERROR_DRM_CANNOT_HANDLE anymore
  - expectedKeyRequest and knownKeyResponse should use
    '-' and '_' instead of '+' and '/' for base64Url encode;
    one uint8_t change from 0x2b to 0x2d for each vector

2. Add tests to create clearkey drm and crypto plugin using
both common pssh box format system ID and clearkey scheme
UUID.

Test: Vts test on Marlin and Taimen
  adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/
  VtsHalDrmV1_0TargetTest

Test: Cts ClearKeyTest on Marlin and Taimen
  ANDROIOP= ./android-cts/tools/cts-tradefed run cts
  -m CtsMediaTestCases
  --test android.media.cts.ClearKeySystemTest

Test: ClearKey plugin unit tests
  adb shell LD_LIBRARY_PATH="/vendor/lib/mediadrm"
  /data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest

Test: netflix and Play Movies & TV for sanity check

bug: 66327050
Change-Id: Icfbe715cf246a7c5253d5f104d0fd446618b18bd
2017-10-04 03:31:27 +00:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Martijn Coenen
c36e35f5a7 Merge changes from topic "fix-omx-dependencies" am: d429b1f9e7 am: 4e8e84e10b
am: 4b5313cbdf

Change-Id: Id06c5e5047a7df2fa084d6fbc2536a54919550a2
2017-09-11 21:31:04 +00:00
Martijn Coenen
4e8e84e10b Merge changes from topic "fix-omx-dependencies"
am: d429b1f9e7

Change-Id: Ic50e4bc973f6a16f0ed1a1f051dc354e69b0e39d
2017-09-11 20:53:17 +00:00
Martijn Coenen
567cbf1148 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-09-06 10:45:14 -07:00
Jiyong Park
acfcb3039a 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-09-06 10:43:26 -07:00
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
0dcb34fff2 Allow clearkey tests to run if no vendor modules am: 5db2e67293
am: a538a0711e

Change-Id: Id57f15057791c88c84f268a8a69374b42561ed47
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
a538a0711e Allow clearkey tests to run if no vendor modules
am: 5db2e67293

Change-Id: I4507467925abf52954535df5a50ae7494f6b4bac
2017-08-18 04:07:03 +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
Steven Moreland
f5da927e19 Updating all makefiles.
am: dfd8287506

Change-Id: I915b69ab3a46f25b9abeb525066d6ea89d162176
2017-08-14 21:05:52 +00:00
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +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
ef38715ba3 Merge "Fix ICryptoFactory service" into oc-dev
am: 2c57b00b17

Change-Id: I81cb1a353e63fea48f69e2fc522f70b63a1e8532
2017-06-28 17:30:40 +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
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