commit 1af8230fbc3ce33bcb1426b4fb7c51c6efcc700e
author Paul Crowley <paulcrowley@google.com> Fri Apr 16 17:05:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 16 17:05:40 2021 +0000
tree ab2bbb9cfe0c41bcc8d2a852c5a9b5533926522d
parent 569455a60529ead37bf2b41d31abfacdb227feb0
parent 61ce76485fbb896076271a330c7f49c968e1d6b0

Revert^2 "Expose AID_KEYSTORE" am: 37a413d1c3 am: fe8e0de9a9 am: 61ce76485f

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

Change-Id: I4796c9ed21699aa1ddaa63094101e19c493101e8

libcutils/Android.bp

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