| commit | ff5a2e048bf461e7c59366207f412425a432221f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Sep 07 03:23:01 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 07 03:23:01 2024 +0000 |
| tree | 422e1751dfb450d33689a5e2392fdc519ad2efab | |
| parent | 045d21d6214bab2375d844df7c9e87ce66d98dd8 [diff] | |
| parent | 1c6c1621cf9ba4ac9f9e38ca3376d180ceb57c88 [diff] |
[automerger skipped] Merge 24Q3 to AOSP main am: 05b904603f -s ours am: 1c6c1621cf -s ours am skip reason: Merged-In I4bae1255764b1687e5db6aec799057ac5612c200 with SHA-1 76311aab2a is already in history Original change: https://android-review.googlesource.com/c/platform/system/security/+/3258597 Change-Id: I3626f96f93ba06e8fca13bedea6666ec74d62bd6 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",