commit 6cf40a61dd8edcf31c963a4c7cae81c05e3e4bbb
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 19 20:57:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 19 20:57:19 2021 +0000
tree 190ab9c518e5744522ed1e37431900ff831d453b
parent 661ba03bd64940b568d8fa4266120062f70907d9
parent b453e63715ca016f08ddac3fea23d94c77a49d10

Merge "Use the new more inclusive command-line options."

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index a99cae2..68b21c6 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -362,10 +362,10 @@
     source_stem: "bindings",
     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-var", "AID_USER_OFFSET",
+        "--allowlist-function", "multiuser_get_app_id",
+        "--allowlist-function", "multiuser_get_uid",
+        "--allowlist-function", "multiuser_get_user_id",
+        "--allowlist-var", "AID_KEYSTORE",
+        "--allowlist-var", "AID_USER_OFFSET",
     ],
 }

rootdir/etc/linker.config.json

diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json
index d9f5526..a22ef6f 100644
--- a/rootdir/etc/linker.config.json
+++ b/rootdir/etc/linker.config.json
@@ -18,6 +18,7 @@
     "libnetd_resolv.so",
     // nn
     "libneuralnetworks.so",
+    "libneuralnetworks_shim.so",
     // statsd
     "libstatspull.so",
     "libstatssocket.so",