gn2bp: remove hardcoded jni_registration denylist
Test: m cronet_aml_java
Change-Id: I1470e1faa64f17729c63082228423f8177798d88
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 84eab9b..917da93 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2615,6 +2615,7 @@
"base/android/java/src/org/chromium/base/RadioUtils.java",
"base/android/java/src/org/chromium/base/StreamUtil.java",
"base/android/java/src/org/chromium/base/StrictModeContext.java",
+ "base/android/java/src/org/chromium/base/SysUtils.java",
"base/android/java/src/org/chromium/base/ThreadUtils.java",
"base/android/java/src/org/chromium/base/TimeUtils.java",
"base/android/java/src/org/chromium/base/TimezoneUtils.java",
@@ -2657,6 +2658,8 @@
"base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java",
"base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java",
"base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java",
+ "base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
+ "base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java",
"base/android/java/src/org/chromium/base/library_loader/Linker.java",
"base/android/java/src/org/chromium/base/library_loader/LinkerJni.java",
"base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java",
@@ -2687,6 +2690,7 @@
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java",
+ "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java",
@@ -2917,6 +2921,7 @@
"base/android/java/src/org/chromium/base/RadioUtils.java",
"base/android/java/src/org/chromium/base/StreamUtil.java",
"base/android/java/src/org/chromium/base/StrictModeContext.java",
+ "base/android/java/src/org/chromium/base/SysUtils.java",
"base/android/java/src/org/chromium/base/ThreadUtils.java",
"base/android/java/src/org/chromium/base/TimeUtils.java",
"base/android/java/src/org/chromium/base/TimezoneUtils.java",
@@ -2959,6 +2964,8 @@
"base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java",
"base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java",
"base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java",
+ "base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
+ "base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java",
"base/android/java/src/org/chromium/base/library_loader/Linker.java",
"base/android/java/src/org/chromium/base/library_loader/LinkerJni.java",
"base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java",
@@ -2989,6 +2996,7 @@
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java",
+ "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 17a9608..d1d1d1c 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1516,17 +1516,10 @@
blueprint.add_module(module)
def update_jni_registration_module(module, gn):
- # TODO: deny list is in the arg of jni_registration_generator.py. Should not be hardcoded
- deny_list = [
- '//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java',
- '//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java',
- '//base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java',
- '//base/android/java/src/org/chromium/base/SysUtils.java']
-
# TODO: java_sources might not contain all the required java files
module.srcs.update([gn_utils.label_to_path(source)
for source in gn.java_sources
- if source.endswith('.java') and source not in deny_list])
+ if source.endswith('.java')])
def create_blueprint_for_targets(gn, targets):
"""Generate a blueprint for a list of GN targets."""