| commit | 902544332ce16d678fce0c325de20361976c4be7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 13 22:49:23 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 13 22:49:23 2024 +0000 |
| tree | dc41ec4f94ca31c75802d088a8413b9d5b4b07bc | |
| parent | 4fb479b8f5468f3335ef1da01742ec8163f280e4 [diff] | |
| parent | 15799d0e20e043660828261ef1120bf46ec3aaf8 [diff] |
[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 15799d0e20 -s ours am skip reason: Merged-In I70318dc8b197a93d0f791ac968fc03b7aaf2efaa with SHA-1 4bf401a5f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/30285510 Change-Id: I9937114bb5bfbc356d1392896c6f3dbe014aba65 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 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",