From fb6602dcf62eaa5731697469b1039ae6d5e8bfc9 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 8 Sep 2022 20:50:23 +0000 Subject: [PATCH 1/2] Declare the headers of the ndk_library This creates a dependency edge between the ndk_library and its headers, which should be a no-op in regular Soong builds. This dependency edge will be used in the Multi-tree project to export the relevant .h files into a well known location Formatting changes are from bpfmt Test: m nothing Bug: 239044713 Change-Id: Id8db2858875a4aee904456fe3dec77c71fa47dc9 --- media/native/midi/Android.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media/native/midi/Android.bp b/media/native/midi/Android.bp index 7acb8c744ba77..a991a71fd3f1e 100644 --- a/media/native/midi/Android.bp +++ b/media/native/midi/Android.bp @@ -74,4 +74,8 @@ ndk_library { symbol_file: "libamidi.map.txt", first_version: "29", + export_header_libs: [ + "amidi", + ], + } From 76d971d0d67c2078dfbf0ef3d69b6a295644627a Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 8 Sep 2022 21:20:07 +0000 Subject: [PATCH 2/2] Declare the headers of the ndk_library This creates a dependency edge between the ndk_library and its headers, which should be a no-op in regular Soong builds. This dependency edge will be used in the Multi-tree project to export the relevant .h files into a well known location The headers are in a different git project (frameworks/native) Test: m nothing Bug: 239044713 Change-Id: Ifd00d8d4d3771b2dbd924cea4f2ade0bafc15ed6 --- native/android/Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/native/android/Android.bp b/native/android/Android.bp index 32b7a0780e632..8594ba5ca2da2 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -27,6 +27,9 @@ ndk_library { symbol_file: "libandroid.map.txt", first_version: "9", unversioned_until: "current", + export_header_libs: [ + "libandroid_headers", + ], } cc_defaults {