From 010d9bf8116af24e014beae7dbcfce947faf95fc Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Thu, 15 Jun 2017 13:34:18 -0700 Subject: [PATCH] Remove AAudioTesting.h from headers to be exported to NDK but include the associated names in the global symbol export list, so that apps that receive AAudioTesting.h outside of NDK can access the symbols without dlsym(). Test: builds OK Change-Id: If68f35145d68f359ebb7995ffcf9c9b8f9be6eb1 (cherry picked from commit 4257fd9aba5b29475e6b725c53d03fabdffdfffd) --- media/libaaudio/Android.bp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media/libaaudio/Android.bp b/media/libaaudio/Android.bp index f539ba9722..6e60f24caf 100644 --- a/media/libaaudio/Android.bp +++ b/media/libaaudio/Android.bp @@ -16,12 +16,14 @@ ndk_headers { name: "libAAudio_headers", from: "include", to: "", - srcs: ["include/aaudio/*.h"], + // omit AAudioTesting.h; supplied separately to those who need it + srcs: ["include/aaudio/AAudio.h"], license: "include/aaudio/NOTICE", } ndk_library { name: "libaaudio", + // deliberately includes symbols from AAudioTesting.h symbol_file: "libaaudio.map.txt", first_version: "26", unversioned_until: "current",