commit 6a9b8d0c9bb6e9ccd97ddb6adc7f287b70676386
author David Anderson <dvander@google.com> Tue Apr 06 23:06:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 06 23:06:28 2021 +0000
tree 20738c861cb3ae2f4ca3a14b99175272107475a6
parent 8d7a612f697a2727d50a6ad7ee0c6608c13fe9eb
parent 3b7cf575f0f92b48929a24a2edd9d681a48c7d7e

Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV" am: 0da1d617d2 am: 3b7cf575f0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665501

Change-Id: I62819572f7c0ffc7fae73ceeebb1992d55bda958

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index a99cae2..0f3763c 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -363,9 +363,8 @@
     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",
     ],
 }