Bug 1947505 - Merge the generate_sdk_bindings and generate_sdk_bindings gradle tasks, r=nalexander,geckoview-reviewers,owlish.

Differential Revision: https://phabricator.services.mozilla.com/D237756

Author: fqueze

mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java

@@ -540,6 +540,8 @@ private static void writeOutputFiles(
       StringBuilder aHeaderFile,
       StringBuilder aImplementationFile) {
     FileOutputStream implStream = null;
+    File f = new File(aOutputDir);
+    f.mkdirs(); // Shouldn't throw.  If it fails, we'll error out just below.
     try {
       implStream = new FileOutputStream(new File(aOutputDir, aPrefix + ".cpp"));
       implStream.write(aImplementationFile.toString().getBytes());

mobile/android/gradle.py

@@ -24,43 +24,29 @@ def gradle_lock(topobjdir, max_wait_seconds=600):
         yield
 
 
-def android(verb, *args):
+def main(dummy_output_file, *args):
     env = dict(os.environ)
-    should_print_status = env.get("MACH") and not env.get("NO_BUILDSTATUS_MESSAGES")
-    if should_print_status:
-        print("BUILDSTATUS " + str(time.time()) + " START_GradleAcquireLock " + verb)
     import buildconfig
 
-    with gradle_lock(buildconfig.topobjdir):
-        if should_print_status:
-            print("BUILDSTATUS " + str(time.time()) + " END_GradleAcquireLock " + verb)
-
-        cmd = [
-            sys.executable,
-            mozpath.join(buildconfig.topsrcdir, "mach"),
-            "android",
-            verb,
-        ]
-        cmd.extend(args)
-        # Confusingly, `MACH` is set only within `mach build`.
-        if env.get("MACH"):
-            env["GRADLE_INVOKED_WITHIN_MACH_BUILD"] = "1"
-        if env.get("LD_LIBRARY_PATH"):
-            del env["LD_LIBRARY_PATH"]
+    cmd = [
+        sys.executable,
+        mozpath.join(buildconfig.topsrcdir, "mach"),
+        "android",
+        "export",
+    ]
+    cmd.extend(args)
+    # Confusingly, `MACH` is set only within `mach build`.
+    if env.get("MACH"):
+        env["GRADLE_INVOKED_WITHIN_MACH_BUILD"] = "1"
+    if env.get("LD_LIBRARY_PATH"):
+        del env["LD_LIBRARY_PATH"]
 
-        if should_print_status:
-            print("BUILDSTATUS " + str(time.time()) + " START_Gradle " + verb)
+    should_print_status = env.get("MACH") and not env.get("NO_BUILDSTATUS_MESSAGES")
+    if should_print_status:
+        print("BUILDSTATUS " + str(time.time()) + " START_Gradle export")
 
-        subprocess.check_call(cmd, env=env)
+    subprocess.check_call(cmd, env=env)
 
     if should_print_status:
-        print("BUILDSTATUS " + str(time.time()) + " END_Gradle " + verb)
+        print("BUILDSTATUS " + str(time.time()) + " END_Gradle export")
     return 0
-
-
-def generate_sdk_bindings(dummy_output_file, *args):
-    return android("generate-sdk-bindings", *args)
-
-
-def generate_generated_jni_wrappers(dummy_output_file, *args):
-    return android("generate-generated-jni-wrappers", *args)

mobile/android/gradle/with_gecko_binaries.gradle

@@ -39,19 +39,23 @@ ext.configureLibraryVariantWithJNIWrappers = { variant, module ->
 
     def annotationProcessorsJarTask = project(':annotations').jar
 
+    def classpathFilesProvider = variant.javaCompileProvider.flatMap { javaCompileTask ->
+        project.provider { javaCompileTask.classpath.files }
+    }
+
     def wrapperTask
     if (System.env.IS_LANGUAGE_REPACK == '1') {
         // Single-locale l10n repacks set `IS_LANGUAGE_REPACK=1` and don't
         // really have a build environment.
         wrapperTask = task("generateJNIWrappersFor${module}${variant.name.capitalize()}")
     } else {
-        wrapperTask = task("generateJNIWrappersFor${module}${variant.name.capitalize()}", type: JavaExec) {
+        wrapperTask = tasks.register("generateJNIWrappersFor${module}${variant.name.capitalize()}", JavaExec) {
             classpath annotationProcessorsJarTask.archiveFile
 
             // Configure the classpath at evaluation-time, not at
             // configuration-time: see above comment.
             doFirst {
-                classpath variant.javaCompileProvider.get().classpath.files
+                classpath classpathFilesProvider.get()
             }
 
             mainClass = 'org.mozilla.gecko.annotationProcessors.AnnotationProcessor'
@@ -72,10 +76,4 @@ ext.configureLibraryVariantWithJNIWrappers = { variant, module ->
             dependsOn annotationProcessorsJarTask
         }
     }
-
-    if (module == 'Generated') {
-        tasks["bundle${variant.name.capitalize()}Aar"].dependsOn wrapperTask
-    } else {
-        tasks["assemble${variant.name.capitalize()}"].dependsOn wrapperTask
-    }
 }

mobile/android/mach_commands.py

@@ -48,16 +48,16 @@ def android(command_context):
 
 @SubCommand(
     "android",
-    "generate-sdk-bindings",
-    """Generate SDK bindings used when building GeckoView.""",
+    "export",
+    """Generate SDK bindings and GeckoView JNI wrappers used when building GeckoView.""",
 )
 @CommandArgument(
     "inputs",
     nargs="+",
     help="config files, like [/path/to/ClassName-classes.txt]+",
 )
 @CommandArgument("args", nargs=argparse.REMAINDER)
-def android_generate_sdk_bindings(command_context, inputs, args):
+def export(command_context, inputs, args):
     import itertools
 
     def stem(input):
@@ -67,27 +67,11 @@ def stem(input):
     bindings_inputs = list(itertools.chain(*((input, stem(input)) for input in inputs)))
     bindings_args = "-Pgenerate_sdk_bindings_args={}".format(";".join(bindings_inputs))
 
-    ret = gradle(
-        command_context,
-        command_context.substs["GRADLE_ANDROID_GENERATE_SDK_BINDINGS_TASKS"]
-        + [bindings_args]
-        + args,
-        verbose=True,
-    )
-
-    return ret
-
-
-@SubCommand(
-    "android",
-    "generate-generated-jni-wrappers",
-    """Generate GeckoView JNI wrappers used when building GeckoView.""",
-)
-@CommandArgument("args", nargs=argparse.REMAINDER)
-def android_generate_generated_jni_wrappers(command_context, args):
     ret = gradle(
         command_context,
         command_context.substs["GRADLE_ANDROID_GENERATE_GENERATED_JNI_WRAPPERS_TASKS"]
+        + command_context.substs["GRADLE_ANDROID_GENERATE_SDK_BINDINGS_TASKS"]
+        + [bindings_args]
         + args,
         verbose=True,
     )

widget/android/bindings/moz.build

@@ -12,7 +12,6 @@ with Files("*CompositorWidget*"):
     BUG_COMPONENT = ("Core", "Graphics")
 
 DIRS += [
-    "bindings",
     "jni",
 ]
 
@@ -158,22 +157,48 @@ XPCOM_MANIFESTS += [
 
 include("/ipc/chromium/chromium-config.mozbuild")
 
+# List of stems to generate .cpp and .h files for.  To add a stem, add it to
+# this list and ensure that $(stem)-classes.txt exists in `bindings/`.
+generated_bindings = [
+    "AccessibilityEvent",
+    "AndroidBuild",
+    "AndroidDragEvent",
+    "AndroidGraphics",
+    "AndroidInputType",
+    "AndroidProcess",
+    "AndroidRect",
+    "InetAddress",
+    "JavaBuiltins",
+    "JavaExceptions",
+    "KeyEvent",
+    "MediaCodec",
+    "MotionEvent",
+    "SurfaceTexture",
+    "ViewConfiguration",
+]
+
+SOURCES += ["!bindings/%s.cpp" % stem for stem in generated_bindings]
+
+EXPORTS += ["!bindings/%s.h" % stem for stem in generated_bindings]
+
 # The recursive make backend treats the first output specially: it's passed as
 # an open FileAvoidWrite to the invoked script.  That doesn't work well with
 # the Gradle task that generates all of the outputs, so we add a dummy first
 # output.
 
 t = tuple(
-    ["generated_jni_wrappers"]
+    ["generated_geckoview_files"]
     + natives_from_WrapForJNI
     + sources_from_WrapForJNI
     + wrappers_from_WrapForJNI
+    + ["bindings/%s.cpp" % stem for stem in generated_bindings]
+    + ["bindings/%s.h" % stem for stem in generated_bindings]
 )
 
 GeneratedFile(
     *t,
     script="/mobile/android/gradle.py",
-    entry_point="generate_generated_jni_wrappers"
+    inputs=["bindings/%s-classes.txt" % stem for stem in generated_bindings]
 )
 
 FINAL_LIBRARY = "xul"