| commit | 26ea10eb3bedfaaf52747a170b5426545c4d0328 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Aug 28 17:44:23 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 28 17:44:23 2024 +0000 |
| tree | 63941bbc665f1d96f7871576b3303cbecf6dc307 | |
| parent | 6aa5e7dd081a967529ea3b8bc36d3f7c77821cb4 [diff] | |
| parent | 5527feb889b98662036fa9acb22a46c66fa5ed7d [diff] |
[automerger skipped] Merge "Allow more error codes on multi-padding failure" into aosp-24Q3-ts-dev am: e2a6621e72 -s ours am: 5527feb889 -s ours am skip reason: Merged-In I3b731e7ccf52e561170e99f23c89fca437c156d8 with SHA-1 7068dda87f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/29016007 Change-Id: I784ffa844297f4a6a56216ee9ebeee0aab5733cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/provisioner/Android.bp b/provisioner/Android.bp index ede1ae6..6a4dc24 100644 --- a/provisioner/Android.bp +++ b/provisioner/Android.bp
@@ -36,6 +36,7 @@ ], static_libs: [ "android.hardware.common-V2-ndk", + "android.hardware.drm.common-V1-ndk", "android.hardware.drm-V1-ndk", "android.hardware.security.rkp-V3-ndk", "libbase",