gn2bp: add common header dependencies to defaults
Chromium builds get these headers directly from sysroot, so they do
not explicitly list the dependency. While this is probably an upstream
bug (or at least a limitation), it is easiest to just add them to
cc_defaults.
This also adds jni_headers which are required by multiple targets.
Test: //components/cronet/android:cronet
Change-Id: Ifb8843aaa60b2454544886b3e60aae42f9a5388e
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 87f3931..9c29144 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -931,7 +931,6 @@
],
header_libs: [
"jni_headers",
- "media_ndk_headers",
],
cpp_std: "c++20",
target: {
@@ -3379,6 +3378,12 @@
],
stl: "none",
target: {
+ android: {
+ header_libs: [
+ "jni_headers",
+ "media_ndk_headers",
+ ],
+ },
host: {
cflags: [
"-UANDROID",