commit 4f0fd464cae3088d4256a0f14acb80694ffd2e23
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 01 14:54:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 01 14:54:01 2024 +0000
tree 35c61d1f689d6518593cbba3fe73ee6ab37cbfd2
parent aaa612b0e6eb147c7003cd19ffd9c8ce8b0908a8
parent 4ec2fb9b52da8b55477be9d17f16143c2d7a90ad

Merge "Skip device id attestation tests on devices receiving only system update and not vendor update, on such devices `android.software.device_id_attestation` feature may not be configured correctly." into main am: ac0588e25e am: 4ec2fb9b52

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3288197

Change-Id: Ie19ea74f8c0ddb7103cf86d13603b637aa600273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

provisioner/Android.bp

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",