From a801eabe11ecdfe18b327f67d3b53bfb517551a4 Mon Sep 17 00:00:00 2001
From: Ulyana Trafimovich <skvadrik@google.com>
Date: Tue, 6 Apr 2021 16:07:07 +0000
Subject: [PATCH] Revert "Expose AID_KEYSTORE"

Revert "Cryptographic security for MAX_BOOT_LEVEL"

Revert submission 1660531-max-boot-level-crypto

Reason for revert: broken test com.android.tests.odsign.OnDeviceSigningHostTest#verifyArtUpgradeSignsFiles on aosp-master on aosp_cf_x86_64_phone-userdebug at 7261517

Reverted Changes:
Ia3b968afc:Set earlyBootEnded before apex starts
Ia69891291:Expose AID_KEYSTORE
I12530cd13:Cryptographic security for MAX_BOOT_LEVEL

Bug: 184635938
Change-Id: Id02f63a794544d650abb95c8e7f201eea03391eb
Test: forrest run for the broken test
---
 libcutils/Android.bp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index a99cae266..0f3763c50 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -363,9 +363,8 @@ rust_bindgen {
     local_include_dirs: ["include"],
     bindgen_flags: [
         "--whitelist-function", "multiuser_get_app_id",
-        "--whitelist-function", "multiuser_get_uid",
         "--whitelist-function", "multiuser_get_user_id",
-        "--whitelist-var", "AID_KEYSTORE",
+        "--whitelist-function", "multiuser_get_uid",
         "--whitelist-var", "AID_USER_OFFSET",
     ],
 }