gn2bp: Use libmediandk to include <media/NdkMediaError.h>
media_ndk_headers is not available to tethering apex.
But header files are available via libmediandk ndk_library
Test: m
Change-Id: I319d9f3a68c64d7b73af68db40d4a509eba59cd3
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 373613e..2e53118 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -4379,9 +4379,11 @@
min_sdk_version: "29",
target: {
android: {
+ shared_libs: [
+ "libmediandk",
+ ],
header_libs: [
"jni_headers",
- "media_ndk_headers",
],
},
host: {
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 6dc2901..8a3c38b 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1595,9 +1595,11 @@
# Chromium builds do not add a dependency for headers found inside the
# sysroot, so they are added globally via defaults.
defaults.target['android'].header_libs = [
- 'media_ndk_headers',
'jni_headers',
]
+ defaults.target['android'].shared_libs = [
+ 'libmediandk'
+ ]
defaults.target['host'].cflags = [
# -DANDROID is added by default but target.defines contain -DANDROID if
# it's required. So adding -UANDROID to cancel default -DANDROID if it's