Commit graph

204 commits

Author SHA1 Message Date
bohu
17b4bcfcfa drm: allow to build on 64bit only guest
Change-Id: If13e87b61c8e5efa447f494ff527478cf97175ff
2021-01-25 21:51:00 -08:00
Dan Shi
6086e20a02 Merge "Suppress gtest error for tests without any instance" am: de3f15adc0 am: acfabe652f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1425889

Change-Id: I8b25839bef2f81a02590357dc7c3658ea4499f76
2020-09-15 23:06:07 +00:00
Dan Shi
ac9cf4482b Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
Merged-In: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
2020-09-11 11:02:25 -07:00
Robert Shih
f4f299d96a Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: I7ec5fa45332acee0a3664ca93ba8fe689439ffdd
2020-08-28 20:03:16 +00:00
Robert Shih
f2eaf2c299 VtsHalDrm: run tests in single shard
Currently drm cert provisioning is performed as an indivdual test case.
Other tests (e.g. decrypt tests) have dependency on drm cert
provisioning.

Bug: 165493235
Test: VtsHalDrmV1_0TargetTest
Test: VtsHalDrmV1_1TargetTest
Test: VtsHalDrmV1_2TargetTest
Test: VtsHalDrmV1_3TargetTest
Change-Id: I7aad35747997e6ce5b06919344475e0f2754cd15
2020-08-27 08:58:04 -07:00
Dan Shi
ba4d532fee Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I8c1a48e6fbd7c8161137902b5332911fa0d7b8b3
2020-07-28 15:12:32 -07:00
Bill Peckham
294ad24d74 Convert Android.mk to Android.bp for vendor snapshot.
This change enables the converted modules to be included
in the vendor snapshot, which considers only
soong-defined modules.

Conversion of the modules in this directory to
Android.bp was blocked by a build-time conditional check
of TARGET_ENABLE_MEDIADRM_64. Using a Soong config
variable, we can perform the conversion.

Bug: 161571531
Bug: 123557988
Test: Build with TARGET_ENABLE_MEDIADRM_64 :=
Test: Build with TARGET_ENABLE_MEDIADRM_64 := true
Test: Insepction of out/soong/soong.variables for each
Test: Inspection of target files package for each
Test: Verify inclusion of modules in vendor snapshot
Change-Id: I47c3b739dfafdf619f8a9a85de560652966af290
2020-07-23 14:33:20 -07:00
Jooyung Han
d610435ac4 update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-07 16:22:36 +09:00
Dan Shi
4c6e4c7ec4 Merge "Rename vts-core to vts" into rvc-dev 2020-04-08 03:58:41 +00:00
Dan Shi
aad51fa000 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 16:37:40 -07:00
Dan Shi
ba894f81db Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 15:17:02 -07:00
Dan Shi
f956a7ea0a Push prebuilt libvtswidevine to device for drm HAL tests
Bug: 143220441
Test: atest VtsHalDrmV1_0TargetTest \
  VtsHalDrmV1_1TargetTest\
  VtsHalDrmV1_2TargetTest
Change-Id: I4ad91c99956525120549321d227aaf6864877c76
Merged-In: I4ad91c99956525120549321d227aaf6864877c76
2020-04-07 12:55:00 -07:00
Automerger Merge Worker
086c30878e Merge "drm vts: link dynamic libcrypto.so to pass FIPS" am: 5fe9f89858
Change-Id: I73475101a6390a921269b3b68e702aa5c653258d
2020-03-03 05:47:27 +00:00
Treehugger Robot
5fe9f89858 Merge "drm vts: link dynamic libcrypto.so to pass FIPS" 2020-03-03 05:33:25 +00:00
Automerger Merge Worker
3e83f9593b Merge "Push prebuilt libvtswidevine to device for drm HAL tests" am: 99b3f37a51
Change-Id: Ia3591c7e4066f10c87d4a521c54dde8d69bf22b1
2020-02-27 23:06:05 +00:00
Robert Shih
d85c649e5b drm vts: link dynamic libcrypto.so to pass FIPS
Bug: 149035295
Test: VtsHalDrmV1_0TargetTest
Test: VtsHalDrmV1_2TargetTest
Change-Id: I6206e39411ccf0ccd72dd02d9b9d932f7d488a42
2020-02-26 15:31:23 -08:00
Dan Shi
3d0285b182 Push prebuilt libvtswidevine to device for drm HAL tests
Bug: 143220441
Test: atest VtsHalDrmV1_0TargetTest \
  VtsHalDrmV1_1TargetTest\
  VtsHalDrmV1_2TargetTest
Change-Id: I4ad91c99956525120549321d227aaf6864877c76
2020-02-26 09:24:34 -08:00
Robert Shih
aba5f2f610 Merge "drm vts 1.0 refactor"
am: ae3a851727

Change-Id: I6216e690fb74bfcf0cc02dbed2093b6a33677c88
2020-01-28 21:37:33 -08:00
Robert Shih
ae3a851727 Merge "drm vts 1.0 refactor" 2020-01-29 05:31:10 +00:00
Robert Shih
d94926c55d Merge "Add drm hal/vts owners"
am: 72c3a98e9f

Change-Id: If29d7653aa2d75bf9a839519738146fefd2bebec
2020-01-28 15:12:33 -08:00
Robert Shih
e44ad509d6 Add drm hal/vts owners
Change-Id: Ie6f0116a0fc9f4590b3a272d877c0d5be719d624
2020-01-28 13:14:09 -08:00
Robert Shih
ec5d8ab919 drm vts 1.0 refactor
* accept drm scheme as part of test parameter
* extract test cases into separate library

Bug: 142397658
Change-Id: I2f56d4e892b2fe45eabf37b351b5017a67828ee4
2020-01-28 05:17:28 +00:00
Robert Shih
d3411d0ce4 Merge "drm vts: introduce helper library"
am: 3a8eb92143

Change-Id: I8960aa5d7a264c37916335dc898a914e0c8bd9cf
2020-01-27 16:16:50 -08:00
Robert Shih
f2fd4adece drm vts: introduce helper library
The helper library includes
* gtest parameter structure (hal instance name, drm scheme uuid)
* existing vendor module APIs

Bug: 142397658
Test: VtsHalDrmV1_0TargetTest
Change-Id: Ifbb443fcb1414e45de2a2073ec545ddd422b9a4d
2020-01-27 20:16:43 +00:00
Steven Moreland
d246996124 Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test"
am: ca61d1a366

Change-Id: Ieff14ff236c884e5611075258695987a2a606256
2020-01-16 10:38:30 -08:00
Dan Shi
d5f85888fe Convert VtsHalDrmV1_*TargetTest to be parameterized test
Removing dependency from VTS infrastructure so that test can run
standalone, for instance with atest/TEST_MAPPING. Once this is
done for every test, VTS can use the core testing infra.

Bug: 142397658
Test: atest VtsHalDrmV1_0TargetTest VtsHalDrmV1_1TargetTest \
  VtsHalDrmV1_2TargetTest
Change-Id: Ic436d949f5b26087e32c48fac220cd5abad8a443
2020-01-15 20:24:08 +00:00
Automerger Merge Worker
66fb6492f5 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d am: 43f65e0f60
Change-Id: I66ebe64f3387a8b46eb745c6b037877605e05945
2020-01-09 05:21:10 +00:00
Automerger Merge Worker
119b9ea01d default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f
Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
2020-01-09 04:51:59 +00:00
Automerger Merge Worker
0e8630788f default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0
Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
2020-01-09 04:33:04 +00:00
Automerger Merge Worker
44fa9a5cf0 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac
Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303
2020-01-09 04:14:08 +00:00
Automerger Merge Worker
86828796ac default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3
Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107
2020-01-09 03:59:10 +00:00
Steven Moreland
0942e33017 Merge "./update-makefiles.sh, for union changes/memory"
am: 00daede4d5

Change-Id: Ie67ccdf2decd3643936793a17d23646452a227b2
2019-11-26 14:55:40 -08:00
Steven Moreland
7696aa885f ./update-makefiles.sh, for union changes/memory
Many more types can be used in Java.

Bug: 143566068
Test: N/A
Change-Id: Ie18e1e0f9c22f2ea15b755df3b048c9d651c4945
2019-11-26 09:24:31 -08:00
Robert Shih
d79abbb0d3 default drm hidl: Fix decrypt destination base ptr
Bug: 144351324
Test: poc_CryptoPlugin_155
Change-Id: Id5d221cd6978d55c46c0368aceb10c1d2f559fd9
2019-11-18 08:23:30 +00:00
Colin Cross
978e59e401 Merge "Use libcrypto_static instead of libcrypto" am: c048c187be
am: 06b758a918

Change-Id: I7cef34166243e60df62b9ab2a1cb8de3142e4104
2019-09-26 07:54:40 -07:00
Colin Cross
263d2df2c7 Use libcrypto_static instead of libcrypto
Replace libcrypto with libcrypto_static, which can be protected through
visibility to ensure only modules that don't affect FIPS certification
can use it.

Bug: 141248879
Test: m checkbuild
Change-Id: I8685cb06d15f3425eeb96d998ffda54c82dcd387
2019-09-18 11:07:09 -07:00
Robert Shih
103efe8c40 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283
am: 4d3b73ee5e

Change-Id: I984dbf4463f731bced310342b5763a14ad0cdc4d
2019-09-11 21:30:09 -07:00
Robert Shih
f6e7c9ed25 default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe
am: 756f134fcc

Change-Id: I4289e38c6eab3e8cac9e489a08f74b3efcf008f9
2019-09-11 21:18:04 -07:00
Robert Shih
756f134fcc default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]
am: d22f1447fe

Change-Id: I480b83a0c4ffd752637ff5357b30d6f5c1916b4b
2019-09-11 21:10:00 -07:00
Robert Shih
02ef6a6283 default hidl CryptoPlugin: security fixes
am: 1e18883b72

Change-Id: Ifbbc3cf6c827085046259365808d962ad192c55a
2019-09-11 21:09:00 -07:00
Robert Shih
d22f1447fe default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]
* reject native handle output for clearkey
* validate subsample sizes

Bug: 137370777
Test: cryptopoc
Change-Id: I2a81f2a00ebf7954b16fb10d2af586ce0da801ed
2019-09-11 22:08:28 +00:00
Robert Shih
1e18883b72 default hidl CryptoPlugin: security fixes
* reject native handle output for clearkey
* validate subsample sizes

Bug: 137370777
Test: cryptopoc
Change-Id: Idf075e1a297fe1ab3ea3e1621806dd46b4a51e35
2019-09-11 22:08:19 +00:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Peter Kalauskas
724a9fc643 Add lazy service target for drm HAL
Test: Run gts on Pixel 1/2/3, marlin_svelte, and walleye_svelte
Bug: 112386116
Change-Id: I5d86e3158794ebae967efb009a0cef8cd140ccb7
2019-01-08 09:00:23 -08:00
Chih-hung Hsieh
df66e3cb29 Merge "Fix performance-for-range-copy warnings" am: d01f7050ac am: 51e835ce22
am: 86fefab5e9

Change-Id: Ib139d710d47a7a51e24ba8ba582b252f5ff6e244
2018-12-17 14:09:52 -08:00
Chih-Hung Hsieh
65ab67312b Fix performance-for-range-copy warnings
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92
2018-12-17 19:57:21 +00:00