Create new Keystore2 java_aconfig_library
In order to flag frameworks code using Keystore2 flags, create a new library specifically for frameworks that depends on `framework-minus-apex-aconfig-java-defaults`. Without this (e.g. if `keystore2_flags_java` is used instead), a flag cycle dependency is created (b/293195086).
Bug: 369375199
Test: treehugger
(cherry picked from https://android-review.googlesource.com/q/commit:36d895698037452da03c8f855a17709057744fcd)
Ignore-AOSP-First: Running into automerger merge conflict issues on AOSP
wrt merging (a dependent CL) downstream into git_aosp-main-future, so merging into that branch first.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de6c81f16f97ac114ad136457741a620cdeeeb14)
Merged-In: I5f039a3c4a69eb6fb8c21fbf5849a85dea49e8f5
Change-Id: I5f039a3c4a69eb6fb8c21fbf5849a85dea49e8f5
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",