commit 2069472e9e66b3b7d6fa7800a1f91c0e9290b4c2
author Jim Pollock <jmpollock@google.com> Thu Sep 02 23:58:46 2021
committer Copybara-Service <copybara-worker@google.com> Fri Sep 03 01:03:48 2021
tree a0777b1cfa2dc06ddc5018cecb3b133b7dcf2eb8
parent 05807ab5b35a7c413516bae73d496de1360e9ae9

core: update from upstream

Followed instructions from go/nnapi-dep-instructions.

No manual changes / interventions have been made.

BUG=b:197814725
TEST=none, this gets tested when manually uprevving the package

Change-Id: I36b77496b85357369204bdb1ac1efd23acb0c214
NOKEYCHECK=True
GitOrigin-RevId: 77736a8118e750db8fadd6d196814f46e2624c30

Android.bp

diff --git a/Android.bp b/Android.bp
index 540a246..99c88cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,9 @@
     recovery_available: true,
     native_bridge_supported: true,
     defaults: ["libsync_defaults"],
-    llndk_stubs: "libsync.llndk",
+    llndk: {
+        symbol_file: "libsync.map.txt",
+    },
     stubs: {
         symbol_file: "libsync.map.txt",
         versions: [
@@ -51,12 +53,6 @@
     },
 }
 
-llndk_library {
-    name: "libsync.llndk",
-    symbol_file: "libsync.map.txt",
-    export_include_dirs: ["include"],
-}
-
 cc_test {
     name: "sync-unit-tests",
     shared_libs: ["libsync"],