commit 4d857a71e069b38cd9c67a54e262000a56c4e971
author David Anderson <dvander@google.com> Tue Apr 06 23:12:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 06 23:12:04 2021 +0000
tree 538a088eec32e6f3939c22174296eeb90aa53619
parent d6e63e24e2a354a6d047126667e195cc278707e8
parent 6a9b8d0c9bb6e9ccd97ddb6adc7f287b70676386

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

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

Change-Id: Idf27b63cb3475db8c0fa7dabb9ba73468f6b2c1c

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",
     ],
 }