diff options
author | Jiyong Park | 2017-08-14 01:21:28 -0500 |
---|---|---|
committer | Jae Shin | 2017-09-14 19:33:52 -0500 |
commit | b87f884b99e5daa74a845b3b3e8881cda88a389e (patch) | |
tree | fda64b434b9a8b72b2237f5e780c7fcdf638ae95 /libsync | |
parent | b5ec6a032c254bbbb8508e870035660c86485b5d (diff) | |
download | platform-system-core-b87f884b99e5daa74a845b3b3e8881cda88a389e.tar.gz platform-system-core-b87f884b99e5daa74a845b3b3e8881cda88a389e.tar.xz platform-system-core-b87f884b99e5daa74a845b3b3e8881cda88a389e.zip |
Mark libsync as LL-NDK
libsync is used both by platform (e.g. libui.so) and by same-process
HALs (e.g. android.hardware.graphics.mapper@2.0-impl.so). Therefore it
is eligible for either VNDK-SP or LL-NDK. Among the two choices, LL-NDK
was selected because it is already an NDK and is just a thin wrapper
around a few kernel ioctls.
However, since libui (which is a vendor_available:true library) is using
more symbols that are not available to NDK clients, the extra symbols
are exposed as # vndk tag so that they are only available to VNDK
clients, but not to NDK clients.
Bug: 63866913
Test: BOARD_VNDK_VERSION=current m -j successful (2017 pixel)
Test: the built image is bootable
Merged-In: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
Change-Id: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
(cherry picked from commit 058e0919f6aff67d32d00591a7040fc069c6e40f)
Diffstat (limited to 'libsync')
-rw-r--r-- | libsync/Android.bp | 7 | ||||
-rw-r--r-- | libsync/libsync.map.txt | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/libsync/Android.bp b/libsync/Android.bp index 1646348a9..3fae5e669 100644 --- a/libsync/Android.bp +++ b/libsync/Android.bp | |||
@@ -22,10 +22,15 @@ cc_defaults { | |||
22 | 22 | ||
23 | cc_library_shared { | 23 | cc_library_shared { |
24 | name: "libsync", | 24 | name: "libsync", |
25 | vendor_available: true, | ||
26 | defaults: ["libsync_defaults"], | 25 | defaults: ["libsync_defaults"], |
27 | } | 26 | } |
28 | 27 | ||
28 | llndk_library { | ||
29 | name: "libsync", | ||
30 | symbol_file: "libsync.map.txt", | ||
31 | export_include_dirs: ["include"], | ||
32 | } | ||
33 | |||
29 | // libsync_recovery is only intended for the recovery binary. | 34 | // libsync_recovery is only intended for the recovery binary. |
30 | // Future versions of the kernel WILL require an updated libsync, and will break | 35 | // Future versions of the kernel WILL require an updated libsync, and will break |
31 | // anything statically linked against the current libsync. | 36 | // anything statically linked against the current libsync. |
diff --git a/libsync/libsync.map.txt b/libsync/libsync.map.txt index f9057bd7f..53bb07a70 100644 --- a/libsync/libsync.map.txt +++ b/libsync/libsync.map.txt | |||
@@ -19,14 +19,10 @@ LIBSYNC { | |||
19 | sync_merge; # introduced=26 | 19 | sync_merge; # introduced=26 |
20 | sync_file_info; # introduced=26 | 20 | sync_file_info; # introduced=26 |
21 | sync_file_info_free; # introduced=26 | 21 | sync_file_info_free; # introduced=26 |
22 | sync_wait; # vndk | ||
23 | sync_fence_info; # vndk | ||
24 | sync_pt_info; # vndk | ||
25 | sync_fence_info_free; # vndk | ||
22 | local: | 26 | local: |
23 | *; | 27 | *; |
24 | }; | 28 | }; |
25 | |||
26 | LIBSYNC_PLATFORM { | ||
27 | global: | ||
28 | sync_wait; | ||
29 | sync_fence_info; | ||
30 | sync_pt_info; | ||
31 | sync_fence_info_free; | ||
32 | } LIBSYNC_PLATFORM; | ||