Merge "Convert vintf_fragments into vintf_fragment module(s)" into main am: 1abb5c38ee am: 0ec765e415
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3304029
Change-Id: I199bb59dd1832fe26d5ea92fb79ade5ab3124ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 7bba687..f50c052 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -123,6 +123,11 @@
require_root: true,
}
+vintf_fragment {
+ name: "android.system.keystore2-service.xml",
+ src: "android.system.keystore2-service.xml",
+}
+
rust_defaults {
name: "keystore2_defaults",
srcs: ["src/keystore2_main.rs"],
@@ -141,7 +146,7 @@
// selection available in the build system.
prefer_rlib: true,
- vintf_fragments: ["android.system.keystore2-service.xml"],
+ vintf_fragment_modules: ["android.system.keystore2-service.xml"],
required: ["keystore_cli_v2"],
}