Commit Graph

7332 Commits

Author SHA1 Message Date
Jooyung Han
6808813f46 Add build script for widevine apkset.
This builds Widevine APEXes for every target arch and then build APKS
file signed with devkeys.

Bug: 281617982
Test: DIST_DIR=out/dist UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
  TARGET_BUILD_APPS="com.google.android.widevine \
    com.google.android.widevine.nonupdatable \
    com.google.android.widevine.lazy" \
  vendor/widevine/libwvdrmengine/apex/device/build.sh
Change-Id: I6b47d9de3d572298e84b26b744710818e9f75210
2023-05-11 16:01:39 +09:00
Alex Dale
ed81ae2b11 Remove duplicate session ID in metrics dump.
[ Merge of http://go/wvgerrit/174932 ]

Bug: 281794097
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: Id29e1c4298ed5b86453f22012cfccc2cb5ee7d05
2023-05-10 16:20:45 -07:00
Kyle Zhang
86b74e0e61 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac am: e2592a3e20
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I397cc0546b7530332b488c265a28c5c2bde7bd7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:32:04 +00:00
Kyle Zhang
c9863fbc97 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac am: 8c55ada2c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I35aee57028da94738160df5d689bf80eba8c6e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:07:06 +00:00
Kyle Zhang
d9d9a3c82f Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: 1b7a73cbc9 am: 2db7003601
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I7b7fb30c327a645a90c67cc0305d9db3bffc5fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:40:44 +00:00
Kyle Zhang
8c55ada2c0 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I4378a595f5fec4730ed42949be9ecd5964c124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:23:24 +00:00
Kyle Zhang
e2592a3e20 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I0a44e459ec4e288913f3a33d951b9c3612561b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:18:40 +00:00
Kyle Zhang
2db7003601 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: 1b7a73cbc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: Ied02aef7b5210cdb4ef40874eb874e07acd91368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:01:41 +00:00
Kyle Zhang
ec1bedb5ac Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: Iab9ef74a334cad8d5e77853b62b11ca7abd3abbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:38:37 +00:00
Kyle Zhang
1b7a73cbc9 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: Ie70dd6b6cb6459571a8678e301d51b402787bd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:13:26 +00:00
Kyle Zhang
1a42aed25b Merge changes Icd280b53,I6eed117e into udc-dev
* changes:
  Cast Receiver integration test
  Combine provisioning code for tests and improve logging
2023-05-10 18:40:30 +00:00
Fred Gylys-Colwell
d211195f92 Cast Receiver integration test
Merge from Widevine repo of http://go/wvgerrit/169471

Remove the test in android tests and add it to the
core tests.

Bug: 276464340
Test: GTEST_FILTER="CorePIGTest.CastReceiverProvisioning*" jenkins/run_fake_l1_tests
Change-Id: Icd280b532ddae274f66b2fab3e65520e96adb7cb
2023-05-10 18:40:21 +00:00
Fred Gylys-Colwell
836b1a30a6 Combine provisioning code for tests and improve logging
Merge from Widevine repo of http://go/wvgerrit/169018

This CL adds a provisioning holder that attempts to
provision and logs the request and response for
failures. The server team can replay the request to debug
problems on their end.

Bug: 276464340
Test: ran cast and ota tests
Change-Id: I6eed117e504ae3287f2ba16c3c507cfdc7456f8d
2023-05-10 18:38:50 +00:00
Rahul Frias
5efd913d48 Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af am: 2aa838ef07
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Ie550b05fc0468c467bebfc0c1b3adfb38501ef10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:00:46 +00:00
Rahul Frias
278b24d375 Fix oec session id in dynamic adpater am: 09d7572ece am: 7b9a15c592 am: cf5f3ea3ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I8d3b3eb6221e1261eb05aa5f9e45b4a39464fc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:56:41 +00:00
Rahul Frias
615bbcbbd4 Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af am: a39c13f8cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Idb5da7e84f2d43034b217d248a9c470db48decf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:55:30 +00:00
Rahul Frias
cf5f3ea3ba Fix oec session id in dynamic adpater am: 09d7572ece am: 7b9a15c592
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I15d95408496c122813bcefcfce162970339a06c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:57:53 +00:00
Rahul Frias
2aa838ef07 Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Ia269e502ef01fa5f09de198a417fa078b7951ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:56:51 +00:00
Rahul Frias
a39c13f8cf Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Ibeaebb9ac1deda051cfb68393dab255581baf7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:52:37 +00:00
Rahul Frias
d596e934af Fix oec session id in dynamic adpater am: 09d7572ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I6666ff4867e93535ead2dad7f912ee99f2cc7b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:14:39 +00:00
Rahul Frias
7b9a15c592 Fix oec session id in dynamic adpater am: 09d7572ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I2fb40404e53aa4cee492ed0c435e3b42136aef1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:10:40 +00:00
Rahul Frias
09d7572ece Fix oec session id in dynamic adpater
[ Merge of http://go/wvgerrit/174572 ]

Pass the real oemcrypto session id from `pair.session` instead of
`session` for CopyBuffer, since `session` can be changed when L1
and L3 are running in parallel and `session` in that case may not
be the correct oemcrypto session id any more.

Bug: 279967915
Test: wvts
Change-Id: Ic5e21ccb227d4c4992ef500435fa3b68812c4d9b
2023-05-08 23:21:47 -07:00
Treehugger Robot
44f461bcd5 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 551254d18e am: a0e4ff17d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: I7f383b6f01799fd8fc287f10cadb9ed12326e238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 04:50:01 +00:00
Treehugger Robot
57ff801394 Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 2bba20c73e am: 74464975fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I4fef4eb351a2c910fbef00e21f2013fca873a1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 04:24:59 +00:00
Treehugger Robot
86dfcdf380 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 09a54ed365 am: 4c73f49232
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: Ic5e6599b3e56c0324b6ce3f4596d47b40834813d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 04:01:19 +00:00
Treehugger Robot
a0e4ff17d9 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 551254d18e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: I3267f5f6b48caa78dd6682ce8f04ce179d2df324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:58:45 +00:00
Treehugger Robot
ebdc70d3a3 Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 7e714045b6 am: a5fc5dffaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: Id3ffd66a9b083c605455deea09b9affd1a94f0b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:42:31 +00:00
Alex Dale
e87c5850a8 Updated usage test to expect v16 duration values. am: f2bf164914 am: 633986c2d0 am: d46abc49f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: Ifa872cdc9288723b897f7823e020c346ff026e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:22:59 +00:00
Treehugger Robot
551254d18e Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: I7dc153a7c36ed512ea3955e2b706a94dce60a297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:08:09 +00:00
Treehugger Robot
74464975fd Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 2bba20c73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: Ie11988e16ff1d143da22f46c0e4f2bf520f7a750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:02:49 +00:00
Treehugger Robot
4f4e932061 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 09a54ed365 am: 21e435e3b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: Ib5cffbdd5641cf19839a2f6820191e6156c8bccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:01:59 +00:00
Treehugger Robot
4c73f49232 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 09a54ed365
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: I215aafb76eca3fd6650beda5376713b7ac38a316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 02:14:02 +00:00
Treehugger Robot
21e435e3b7 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783 am: 09a54ed365
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: I40b8b136cfbb3f4ef70420a3dc59437aa6faa65f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 02:10:49 +00:00
Treehugger Robot
2bba20c73e Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I1a0993023df32a4976f8472b3f3d7688cf4b3a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 01:47:36 +00:00
Treehugger Robot
b78e4f8561 Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 7e714045b6 am: 44d207e4a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I18e085837156a718791cf54fbdea5f51c8da4021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 01:27:32 +00:00
Treehugger Robot
09a54ed365 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev am: 24c3bbb783
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049486

Change-Id: Ic475a47f38058649131fb5180b558c66f7b6eb63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 01:26:47 +00:00
Treehugger Robot
a5fc5dffaf Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 7e714045b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I4a4ebf13fd89078213752b04a0df999a6ed2e84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 01:08:55 +00:00
Treehugger Robot
44d207e4a2 Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c am: 7e714045b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I257e6a73298143df873402e33516bf116b7805c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 01:02:50 +00:00
Alex Dale
6565ce4a0f Updated usage test to expect v16 duration values. am: f2bf164914 am: 633986c2d0 am: 4c106b7b96
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: Ia8321841488835402f1668c44b0a7c0df691f931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 00:39:27 +00:00
Treehugger Robot
7e714045b6 Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I7f6b2eff1ea45eac8268e7ff1bfd6b6f21875c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 00:32:29 +00:00
Alex Dale
4c106b7b96 Updated usage test to expect v16 duration values. am: f2bf164914 am: 633986c2d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: I7c6d3a2e9aaf9c49d97faecb51bf8464e5f31f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 23:53:07 +00:00
Alex Dale
d46abc49f9 Updated usage test to expect v16 duration values. am: f2bf164914 am: 633986c2d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: I6353d63d987bab359e075cc38a04e360c623481a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 23:47:28 +00:00
Alex Dale
633986c2d0 Updated usage test to expect v16 duration values. am: f2bf164914
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: I2947622573d455c0a74bda1c162f00996fcc9f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 23:14:12 +00:00
Treehugger Robot
24c3bbb783 Merge "Skip RenewOnLicenseLoad tests for v17 OEMCrypto" into udc-dev 2023-05-08 20:38:47 +00:00
Alex Dale
ecb9cef2f6 Updated usage test to expect v16 duration values. am: f2bf164914 am: 766904974b am: 340fd56fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: I308d630cd2b214fb9f08168ccfa553057ec27e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 20:31:48 +00:00
Alex Dale
340fd56fe1 Updated usage test to expect v16 duration values. am: f2bf164914 am: 766904974b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: I83adae6638c45148e858d7f39b34080c149ffe59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 19:48:18 +00:00
Treehugger Robot
6511d44f3c Merge "Expect failure on license load for expired LDL license" into udc-dev 2023-05-08 19:03:33 +00:00
Alex Dale
766904974b Updated usage test to expect v16 duration values. am: f2bf164914
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23066555

Change-Id: I042b75f71136642c883a97bb9883696291ce9a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 19:00:06 +00:00
Rahul Frias
fa4f9ca07d Skip RenewOnLicenseLoad tests for v17 OEMCrypto
[ Merge of http://go/wvgerrit/173950 ]

Bug: 280641992
Test: duration use case tests
Change-Id: If81df367c9359592b1ba797f6192d413afe55273
2023-05-08 11:55:40 -07:00
Alex Dale
f2bf164914 Updated usage test to expect v16 duration values.
[ Merge of http://go/wvgerrit/174431 ]

It is possible that the initial license duration was limited due to
the finit rental duration; however, if the license has a soft rental
duration, it will be considered unlimited after playback has begun.

The *.UsageTest* have been updated to ignore cases where initial
license durations are finit, but later report as unlimited.

Bug: 275651559
Test: cdm_extended_duration_test
Change-Id: I689163b1066b2bc9f9345e2279e9373010f844cc
2023-05-05 17:30:13 -07:00