Commit Graph

325 Commits

Author SHA1 Message Date
Dan Shi
6b0fd062bb Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
2020-09-08 10:42:38 -07:00
Robert Shih
cb5c081ff9 Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 am: 05453e2dd2 am: 9f0646f100 am: 30e592f3df
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: Ie9ec2153a1c9b564e3fb0135e3e393233954cd3a
2020-08-28 21:15:29 +00:00
Robert Shih
30e592f3df Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 am: 05453e2dd2 am: 9f0646f100
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: Ib7863d4db8d057bd23d939afee213250fc56d9f8
2020-08-28 21:02:18 +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
ff985a85a8 Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
2020-07-29 09:46:36 -07:00
Dan Shi
9eaab747fe Suppress gtest error for tests without any instance am: ba4d532fee am: 73122cd284 am: e5c9b5e722 am: 1a52c0eb25 am: 1a3e0f86eb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374050

Change-Id: I6ddea2dcb636e3ba67ad11d53b9fe12c51314c7a
2020-07-29 06:36:31 +00:00
Dan Shi
e5c9b5e722 Suppress gtest error for tests without any instance am: ba4d532fee am: 73122cd284
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374050

Change-Id: Ie5e956d4613f5e947c36ba4f1048f0c3aa8944ba
2020-07-29 05:45:58 +00: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
33ef5c2276 Merge "Convert Android.mk to Android.bp for vendor snapshot." am: 9b04c73565 am: c164e01c68 am: 1b187c1447 am: f59bd619c2 am: 14afcf2333
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1368997

Change-Id: I44e07933bb77270569c2299b6f992ac8c530f950
2020-07-24 17:00:39 +00:00
Bill Peckham
1b187c1447 Merge "Convert Android.mk to Android.bp for vendor snapshot." am: 9b04c73565 am: c164e01c68
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1368997

Change-Id: I7ba6b90c5036fb9adfc6822bf566216290afa475
2020-07-24 16:04:14 +00: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
Jooyung Han
d18cba85fe 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-02 12:26:37 +09:00
Jooyung Han
b0907a6bb8 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
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
2020-07-02 09:18:17 +09:00
TreeHugger Robot
26a82198b3 Merge "Add WifiPreparer to drm tests to confirm wifi connection" into rvc-dev am: 2c29c52616 am: dd8881d373 am: ac4f105899 am: 561294807b
Change-Id: I43f505c762e2826f70c898b8c712a8a4df8c9359
2020-05-16 00:19:09 +00:00
TreeHugger Robot
dd8881d373 Merge "Add WifiPreparer to drm tests to confirm wifi connection" into rvc-dev am: 2c29c52616
Change-Id: Ifc33021a5a3c737a74211735a1dc0c38372f7418
2020-05-15 23:32:29 +00:00
Dan Shi
15bbf84240 Add WifiPreparer to drm tests to confirm wifi connection
The tests require wifi connectivity.

Bug: 156266690
Test: none
Change-Id: Ib5116d62265241938f9292956b3c4829da7b425e
2020-05-14 23:44:38 -07:00
TreeHugger Robot
5732df8917 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev am: bb14d6b3b6 am: b614cc2bd4 am: b3a891ff0f am: 469dfc6767
Change-Id: Ie8d1c60b677c6b0a3be7c6769a772c51550f9473
2020-04-08 21:17:56 +00:00
Robert Shih
22930f4812 Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev am: 9ef4f067ba am: 72d8b4e540 am: bb6b690a41 am: 79da998598
Change-Id: I93f321fd84d1159c6497739c7bf534c73270ac9c
2020-04-08 20:53:59 +00:00
TreeHugger Robot
b3a891ff0f Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev am: bb14d6b3b6 am: b614cc2bd4
Change-Id: I94f923381f1761e54d6827d14f378d044410ca4b
2020-04-08 20:53:27 +00:00
TreeHugger Robot
80a56796d6 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev am: bb14d6b3b6
Change-Id: Ie3560f346b6fdaded3373d48b2acc06da67a2eeb
2020-04-08 20:43:10 +00:00
TreeHugger Robot
bb14d6b3b6 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev 2020-04-08 20:29:46 +00:00
Robert Shih
bb6b690a41 Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev am: 9ef4f067ba am: 72d8b4e540
Change-Id: Ib6585253f050f253032eda6e8731c62c7a868796
2020-04-08 20:25:06 +00:00
Robert Shih
d7c3a55282 Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev am: 9ef4f067ba
Change-Id: Ia556b0d1216f4ddfede373bbd4b918745bbd4cde
2020-04-08 20:08:51 +00:00
Robert Shih
9ef4f067ba Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev 2020-04-08 19:57:52 +00:00
Dan Shi
4c6e4c7ec4 Merge "Rename vts-core to vts" into rvc-dev 2020-04-08 03:58:41 +00:00
Dan Shi
eb5f33e0ef Rename vts-core to vts am: ba894f81db am: 55d110bcd0
Change-Id: Ifc137320af42febc24937f09e5baa4c5a95ac1c4
2020-04-07 23:56:42 +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
TreeHugger Robot
ae2270e1c4 Merge "Push prebuilt libvtswidevine to device for drm HAL test" into rvc-dev am: 1e169a2760
Change-Id: I35c466c3dbef687827729adf5e7880c0a2f6b9f6
2020-04-07 22:28:00 +00: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
TreeHugger Robot
b95fc85203 Merge "Push prebuilt libvtswidevine to device for drm HAL tests" into rvc-dev 2020-04-07 22:08:45 +00: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
Dan Shi
ee9f3acae3 Push prebuilt libvtswidevine to device for drm HAL test
Bug: 143220441
Test: atest VtsHalDrmV1_3TargetTest
Change-Id: I08af2bf9524b0bbb362c28eceef5e6642545ecc7
(cherry picked from commit d7c88e3e55)
2020-04-07 18:44:19 +00:00
Dan Shi
3a8a650c61 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
2020-04-07 18:03:49 +00:00
Dan Shi
fbf9d924a2 Add libvtswidevine dep to VtsHalDrmV1_3TargetTest
Bug: 150468341
Test: atest VtsHalDrmV1_3TargetTest
Change-Id: I3885efd35c97a5451881c2f6dd8fdf86bf12d089
2020-04-07 06:53:28 +00:00
Robert Shih
bedb2d9ce3 drm 1.3 vts: call signRSA with non-empty args
Bug: 153356263
Test: VtsHalDrmV1_3TargetTest
Change-Id: If6c6e9f478458c004063cebc195e7e77084fc11d
2020-04-06 16:53:55 -07:00
Automerger Merge Worker
a8be8e7428 Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev am: 94f97bdf1b am: 9791bf088d am: 9473152c95 am: 0b61d70db2
Change-Id: Ie1ffd4a7a19b9fde6c8386d374a76c164e2de062
2020-03-06 20:23:12 +00:00
Automerger Merge Worker
9473152c95 Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev am: 94f97bdf1b am: 9791bf088d
Change-Id: I89e801eb70552ad22edcbe616a6afaafeeda2ee2
2020-03-06 20:04:31 +00:00
Automerger Merge Worker
3419a7786d Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev am: 94f97bdf1b
Change-Id: Idbf10b2e60b819aecb344b6247148bb669c4d9a9
2020-03-06 19:46:15 +00:00
Dan Shi
7c6d8350b5 Merge "Push prebuilt libvtswidevine to device for drm HAL test" 2020-03-03 16:57:33 +00:00
Automerger Merge Worker
ea9e71ac11 Merge "drm vts: link dynamic libcrypto.so to pass FIPS" am: 5fe9f89858 am: 086c30878e
Change-Id: Id15b7a05b2f65bc89587335abc40a99d7a9d8106
2020-03-03 05:58:46 +00: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
Robert Shih
65f6b95b6d drm@1.3 vts: link dynamic libcrypto.so to pass FIPS
Bug: 149035295
Test: VtsHalDrmV1_3TargetTest
Change-Id: I34d3537d1008c2d03db78b33687879b9fe24e8ad
2020-03-03 04:27:23 +00:00
Dan Shi
d7c88e3e55 Push prebuilt libvtswidevine to device for drm HAL test
Bug: 143220441
Test: atest VtsHalDrmV1_3TargetTest
Change-Id: I08af2bf9524b0bbb362c28eceef5e6642545ecc7
2020-03-02 14:11:00 -08:00
Automerger Merge Worker
dfecdb5358 Merge "Push prebuilt libvtswidevine to device for drm HAL tests" am: 99b3f37a51 am: 3e83f9593b
Change-Id: Ied9cf2afdc0e0c37c41febcd507bd6396b84de1e
2020-02-27 23:22:03 +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
3559eb0e8b drm: add 1.3 vts
Bug: 139313724
Bug: 139134043
Change-Id: I54af955790e76dc364e7ff9f9d6984d9b6abbb68
2020-01-31 22:07:01 -08:00