core: update from upstream
Followed instructions from go/nnapi-dep-instructions.
No manual changes / interventions have been made.
$ git merge origin/master --no-ff
$ git push origin HEAD:refs/for/master
BUG=b:177048246
TEST=cq passes
Submitting directly since this repo is not mapped into ChromeOS, but is
used by copybara to populate other repos (libutils, libcutils).
Exempt-From-Owner-Approval: This is a forked repo
Change-Id: I4e1c0c21f26ea8ad409c47646c8617f55c676e6a
GitOrigin-RevId: 15e8363d6289ccf3e60fd8b7bd29e9258ba82493
diff --git a/Android.bp b/Android.bp
index c996e1b..4828892 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,10 +25,17 @@
recovery_available: true,
native_bridge_supported: true,
defaults: ["libsync_defaults"],
+ llndk_stubs: "libsync.llndk",
+ stubs: {
+ symbol_file: "libsync.map.txt",
+ versions: [
+ "26",
+ ],
+ },
}
llndk_library {
- name: "libsync",
+ name: "libsync.llndk",
symbol_file: "libsync.map.txt",
export_include_dirs: ["include"],
}
diff --git a/libsync.map.txt b/libsync.map.txt
index 91c3528..aac6b57 100644
--- a/libsync.map.txt
+++ b/libsync.map.txt
@@ -19,7 +19,7 @@
sync_merge; # introduced=26
sync_file_info; # introduced=26
sync_file_info_free; # introduced=26
- sync_wait; # llndk
+ sync_wait; # llndk apex
sync_fence_info; # llndk
sync_pt_info; # llndk
sync_fence_info_free; # llndk
