Commit Graph

7119 Commits

Author SHA1 Message Date
Jooyung Han
9f2adca71c Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I0d0860975cf8bc27690b892c8164af649f79977a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:34:12 +00:00
Jooyung Han
fbaede0920 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I0dcd49214028a32eeeca0f2ecd16ad3ada6a626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 08:53:25 +00:00
Jooyung Han
d13f8124ff Merge "Add build script for widevine apkset." into udc-dev 2023-05-12 08:14:22 +00:00
Alex Dale
47ce6117ef Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: I372c0af8eec7b005d3fe0850d9edf9e383c3a2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:47:04 +00:00
Alex Dale
36da43c5f1 Remove duplicate session ID in metrics dump. am: ed81ae2b11
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: If31c40e4512219338d21872ab43ece22be51ac03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:04:52 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
6511d44f3c Merge "Expect failure on license load for expired LDL license" into udc-dev 2023-05-08 19:03:33 +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
Fred Gylys-Colwell
65d52908af Expect failure on license load for expired LDL license
Merge from Widevine repo of http://go/wvgerrit/170970

RenewOnLicenseLoad.Case2 tests are failing because they
are expecting to load an expired license. However, the spec
says that the license should return KEY_EXPIRED. The test is
being updated.

Some other RenewOnLicenseLoad tests were failing because
they forgot to request the renewal.

Bug: 278750980
Test: Run tests on Luci
Change-Id: I7196db11fcf43859ba9310b87fd8ccb609e47039
2023-05-04 21:18:06 -07:00
Treehugger Robot
b464cb322c Merge "Drop prebuilt files to android source tree." into udc-dev am: 651776f475 am: b474dc1702
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22975314

Change-Id: If786ea06c51ba2957eb1b1e21a6b935d757a6bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:24:00 +00:00
Treehugger Robot
fb3eb7a5af Merge "Widevine apex cleanup" into udc-dev am: 630fbd2251 am: f370c03a03
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22938238

Change-Id: I1961362e22537312a590318600fdf13ed2e81cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:23:58 +00:00
Alex Dale
b49f99dfa4 Merge "Exclude the default CDM from metrics history." into udc-dev am: 2e84e8b5f7 am: 13d3ef216f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22957292

Change-Id: Ie5f540fb0bbcd0bba161bd870ca7d4edf67547e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:23:44 +00:00
Treehugger Robot
b474dc1702 Merge "Drop prebuilt files to android source tree." into udc-dev am: 651776f475
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22975314

Change-Id: I763141d0a9d370f08d68927f12cb7f6e9533287a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:41:08 +00:00
Treehugger Robot
f370c03a03 Merge "Widevine apex cleanup" into udc-dev am: 630fbd2251
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22938238

Change-Id: I658d9059d234d87ec9446b9ed9988ee3098cdcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:41:07 +00:00
Alex Dale
13d3ef216f Merge "Exclude the default CDM from metrics history." into udc-dev am: 2e84e8b5f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22957292

Change-Id: Id2d7277082d1c95195476ac7e23b0c1982f60100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:39:49 +00:00
Treehugger Robot
651776f475 Merge "Drop prebuilt files to android source tree." into udc-dev 2023-05-03 19:34:04 +00:00
Treehugger Robot
630fbd2251 Merge "Widevine apex cleanup" into udc-dev 2023-05-03 19:34:04 +00:00
Alex Dale
2e84e8b5f7 Merge "Exclude the default CDM from metrics history." into udc-dev 2023-05-03 18:44:06 +00:00
Kyle Zhang
dc9fbae1b4 Widevine apex cleanup
1. Remove prerelease tag.
2. Add TARGET_BUILD_WIDEVINE_USE_PREBUILT to control building from source.
3. Unify config namespace to "widevine".

Bug: 251299786
Bug: 277764729
Change-Id: I2f19bcf8efd280a1a3aa86f595599d79e20b4ff4
2023-05-03 17:38:43 +00:00
Alex Dale
412f09271d Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 9e7df66c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: I7e70f9fdbb575e9c925f0f70fcf46db82406e1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:41:06 +00:00
Treehugger Robot
3419c6bf20 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2691751782
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: Ie065e66cb67783872db9e041fca75f4bbc4cbc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:40:43 +00:00
Alex Dale
9e7df66c95 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: Ie93959d173cf8a78f041d9831bc77b61c7260c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:17:07 +00:00
Alex Dale
82709ebab0 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev 2023-05-03 02:02:45 +00:00
Treehugger Robot
2691751782 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: If0e060c39e67234c8041c1b705bac047198eee6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:59:29 +00:00
Treehugger Robot
c77b0a6bf2 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev 2023-05-03 01:16:23 +00:00
Rahul Frias
ab757ecfb7 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: ca7dc18668
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: Ie177d87a3af532f947e446d89976e1d7ee4c8f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:53:02 +00:00
Rahul Frias
ca7dc18668 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: I21706f7eb5e00ddf407502200a8370841eafdf1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:11:03 +00:00
Alex Dale
628d1ac38c DRM Pluging uses CDM core's generic crypto API.
[ Merge of http://go/wvgerrit/173170 ]

This CL updates the Widevine's Android DRM plugin to use the generic
crypto operations provided by CDM core rather than its own
implementation.

Bug: 274984456
Test: atest WvtsDeviceTestCases
Change-Id: I94e1c92c7da577aad5ec43bd3bf0bb380b607b80
2023-05-02 16:51:23 -07:00
Rahul Frias
a4dc63581f Merge "Add error details when offline license is not found" into udc-dev 2023-05-02 23:41:30 +00:00
Kyle Zhang
d3f2693e17 Drop prebuilt files to android source tree.
The following files have been updated as part of this change:

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

Built here: ab/10026699

The change is generated with prebuilt drop tool.

Bug: 251299786
Change-Id: I51b971baddaa43156a7aecbc6fc7ba37cf94e72a
2023-05-02 21:28:37 +00:00
Cong Lin
8f2e922859 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 am: dae2668d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: I6818114f54c24bdecf2d8a846eea63cc8bcdd30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:55:49 +00:00
Cong Lin
dae2668d93 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: I9b6a55f4ad156e341c7fa56be4d9ea8d521f6abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:16:05 +00:00
Alex Dale
37f125a491 Piped CdmEngine's generic crypto operations to Android CDM.
[ Merge of http://go/wvgerrit/172010 ]

The CdmEngine provides an API for generic crypto operations that are
already used for the CE CDM.  This API is being exposed in the Android
CDM.  The parameter order of the Android CDM is modified to match the
existing generic crypto parameters used in the media DRM plugin.

Bug: 274984456
Bug: 29400687
Test: build x86-64 and Android
Change-Id: I3b286ebb011bd58754b7b8ea814ed46daf1f62f9
2023-05-01 15:50:39 -07:00