commit 39bb5eaac9e736b8315f5510edfc716c02a90ae3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 13 02:29:17 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 13 02:29:17 2024 +0000
tree 26ecf738b308740e7aa54adb52ecfc4d1fcb428a
parent de6c81f16f97ac114ad136457741a620cdeeeb14
parent c3d370a3be77ce81cde4c3a9d8c8e10693340338

Merge "Don't use deviceSuffix, it isn't needed" into main am: 261b77ae4c am: c3d370a3be

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

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

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 4da0b6a..be2f812 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -183,6 +183,12 @@
     host_supported: true,
 }
 
+java_aconfig_library {
+    name: "keystore2_flags_java-framework",
+    aconfig_declarations: "keystore2_flags",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
 rust_aconfig_library {
     name: "libkeystore2_flags_rust",
     crate_name: "keystore2_flags",

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