commit 89f48f77c899c01c268e586e701257246068a87b
author Shaquille Johnson <ssjohnson@google.com> Thu Sep 28 10:31:28 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 28 10:31:28 2023 +0000
tree 5e6105ac04ac3cdf6c494246f92adba3c343ce2a
parent 2ff4165d265da665176862d1379d9e92d3b7f794
parent bce0cac39f3c3dd205e0c9872af1bb1faefba1e2

Merge "Remove java generated files" into main

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 4792e8a..af5f117 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -28,7 +28,6 @@
     defaults: [
         "keymint_use_latest_hal_aidl_rust",
         "keystore2_use_latest_aidl_rust",
-        "framework-minus-apex-aconfig-libraries",
     ],
 
     rustlibs: [

keystore2/aconfig/flags.aconfig

diff --git a/keystore2/aconfig/flags.aconfig b/keystore2/aconfig/flags.aconfig
index 04bbddc..eb636bb 100644
--- a/keystore2/aconfig/flags.aconfig
+++ b/keystore2/aconfig/flags.aconfig
@@ -5,4 +5,5 @@
   namespace: "hardware_backed_security"
   description: "This flag controls changing journalmode to wal"
   bug: "191777960"
+  is_fixed_read_only: true
 }