gn2bp: remove jni_headers from jni_generator genrule
jni_headers are now globally included in defaults.
Test: //components/cronet/android:cronet
Change-Id: Ib1ee183eb556c8144713f7df26270b2df6ee12f9
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 9c29144..79e6ba7 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -929,9 +929,6 @@
"third_party/icu/source/common/",
"third_party/icu/source/i18n/",
],
- header_libs: [
- "jni_headers",
- ],
cpp_std: "c++20",
target: {
android: {
@@ -2482,9 +2479,6 @@
"third_party/protobuf/src/",
"third_party/zlib/",
],
- header_libs: [
- "jni_headers",
- ],
cpp_std: "c++20",
linker_scripts: [
"base/android/library_loader/anchor_functions.lds",
@@ -3210,9 +3204,6 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- header_libs: [
- "jni_headers",
- ],
cpp_std: "c++20",
}
@@ -4684,9 +4675,6 @@
"third_party/protobuf/src/",
"third_party/zlib/",
],
- header_libs: [
- "jni_headers",
- ],
cpp_std: "c++20",
rtti: true,
target: {
@@ -9243,9 +9231,6 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- header_libs: [
- "jni_headers",
- ],
cpp_std: "c++20",
}
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index d2c824d..f740771 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -707,9 +707,6 @@
target.args[0] = '$(out)'
elif target.script == '//base/android/jni_generator/jni_generator.py':
- # chromium builds against a prebuilt ndk that contains the jni_headers, so
- # a dependency is never explicitly created.
- module.genrule_header_libs.add('jni_headers')
needs_javap = False
for i, val in enumerate(target.args):
if val == '--output_dir':