gn2bp: Add java files to the srcs of cronet_jni_registration
jni_registration_generator.py takes the java file paths from the sources
files. But the path in the original file does not work in genrule.
This CL add the required java files to the srcs of
cronet_jni_registration.
Upcoming CL generates source file from the srcs and make
jni_registration_generator.py use the generated source file
Test: ./update_results.sh
Change-Id: Idf74664713b7af614b132bdd456a8a9e2e8876de
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 571cee9..c0473aa 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -1940,6 +1940,29 @@
// GN: //components/cronet/android:cronet_jni_registration
genrule {
name: "cronet_aml_components_cronet_android_cronet_jni_registration",
+ srcs: [
+ "base/android/java/src/org/chromium/base/JniException.java",
+ "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
+ "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
+ "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java",
+ "base/android/java/src/org/chromium/base/annotations/CalledByNative.java",
+ "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java",
+ "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java",
+ "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
+ "base/android/java/src/org/chromium/base/annotations/JNINamespace.java",
+ "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java",
+ "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
+ "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
+ "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
+ "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
+ "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
+ "build/android/java/src/org/chromium/build/annotations/DoNotInline.java",
+ "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java",
+ "build/android/java/src/org/chromium/build/annotations/MainDex.java",
+ "build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
+ "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
+ "url/android/java/src/org/chromium/url/IDNStringUtil.java",
+ ],
cmd: "$(location base/android/jni_generator/jni_registration_generator.py) --srcjar-path " +
"$(genDir)/components/cronet/android/cronet_jni_registration.srcjar " +
"--depfile " +
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 9aa2f2a..768b524 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1175,6 +1175,12 @@
module.srcs.update([gn_utils.label_to_path(source) for source in gn.java_sources])
blueprint.add_module(module)
+def update_jni_registration_module(blueprint, gn):
+ bp_module_name = label_to_module_name('//components/cronet/android:cronet_jni_registration')
+ module = blueprint.modules[bp_module_name]
+ # 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])
+
def create_blueprint_for_targets(gn, desc, targets):
"""Generate a blueprint for a list of GN targets."""
blueprint = Blueprint()
@@ -1199,6 +1205,7 @@
create_modules_from_target(blueprint, gn, target)
create_java_module(blueprint, gn)
+ update_jni_registration_module(blueprint, gn)
# Merge in additional hardcoded arguments.
for module in blueprint.modules.values():