[Feat] (Android): the render server screen and binary ship in the plugin APK too, not just trace

tools/trace_replay/test_android_lifecycle.py

@@ -9,14 +9,16 @@ import xml.etree.ElementTree as ET
 
 def main():
     root = pathlib.Path(__file__).resolve().parents[2]
-    trace = root / "android-plugin/app/src/trace"
+    src = root / "android-plugin/app/src"
+    trace = src / "trace"
+    main_src = src / "main"
     android = "{http://schemas.android.com/apk/res/android}"
     manifest = ET.parse(trace / "AndroidManifest.xml")
     activity = next(a for a in manifest.findall("application/activity")
                     if a.get(android + "name") == ".trace.TraceReplayActivity")
     config_value = activity.get(android + "configChanges", "0")
     if config_value == "@integer/trace_replay_config_changes":
-        resources = ET.parse(trace / "res/values/config.xml")
+        resources = ET.parse(main_src / "res/values/config.xml")
         config_value = resources.find("integer[@name='trace_replay_config_changes']").text
     changes = int(config_value, 0)
     # The failing emulator added resource overlays after replay had already started.
@@ -31,34 +33,52 @@ def main():
     # finds it by this name to enforce one server at a time), software window rendering (HWUI must
     # not share the EGL display Espryt terminates), and the same configChanges as the replay
     # Activity (a rotation or an overlay must not destroy the window a session renders into).
-    display = next((a for a in manifest.findall("application/activity")
+    # The render server ships in BOTH flavors, so these components live in the main manifest.
+    # exported is a manifest placeholder (true for the adb-driven trace flavor, false for the
+    # plugin flavor that ships to users); a literal "true" here would export it from the plugin.
+    exported_placeholder = "${serverComponentsExported}"
+    main_manifest = ET.parse(main_src / "AndroidManifest.xml")
+    display = next((a for a in main_manifest.findall("application/activity")
                     if a.get(android + "name") == ".MobileGLDisplayActivity"), None)
     if display is None:
-        raise RuntimeError("the trace manifest has no MobileGLDisplayActivity (P12 D7)")
+        raise RuntimeError("the main manifest has no MobileGLDisplayActivity (P12 D7)")
     for attribute, expected in (("process", ":mglwin"), ("hardwareAccelerated", "false"),
-                                ("exported", "true"),
+                                ("exported", exported_placeholder),
                                 ("configChanges", activity.get(android + "configChanges"))):
         if display.get(android + attribute) != expected:
             raise RuntimeError(f"MobileGLDisplayActivity android:{attribute} must be {expected!r}, "
                                f"not {display.get(android + attribute)!r}")
-    # Every trace-flavour Java class that has NO android.* import belongs here, because javac
+    for tag, name in (("activity", ".ServerControlActivity"), ("service", ".MobileGLServerService")):
+        component = next((c for c in main_manifest.findall(f"application/{tag}")
+                          if c.get(android + "name") == name), None)
+        if component is None:
+            raise RuntimeError(f"the main manifest has no {name}")
+        if component.get(android + "exported") != exported_placeholder:
+            raise RuntimeError(f"{name} android:exported must be {exported_placeholder!r}, "
+                               f"not {component.get(android + 'exported')!r}")
+    # The trace manifest must not redeclare them: a second declaration would override the placeholder.
+    for tag, name in (("activity", ".ServerControlActivity"), ("service", ".MobileGLServerService"),
+                      ("activity", ".MobileGLDisplayActivity")):
+        if any(c.get(android + "name") == name for c in manifest.findall(f"application/{tag}")):
+            raise RuntimeError(f"the trace manifest redeclares {name}; it belongs to the main manifest")
+    # Every Java class that has NO android.* import belongs here, because javac
     # plus `java` is the only way any of them is exercised outside an APK on a device. P7 added
     # SpawnServerPath: a hand-rolled K=V;K=V parse whose failure mode on device is "the knob had
     # no effect", which is why a defect in it survived from P6. P12 added ServerEnvironment: the
     # server role's environment both servers build (the service's exec environment, the display
     # Activity's own process) and the display's aspect-fit.
     java_units = [
-        ("top.mobilegl.plugin.trace", "TraceReplaySession", "TraceReplaySessionTest"),
-        ("top.mobilegl.plugin.trace", "SpawnServerPath", "SpawnServerPathTest"),
-        ("top.mobilegl.plugin", "ServerEnvironment", "ServerEnvironmentTest"),
+        (trace, "top.mobilegl.plugin.trace", "TraceReplaySession", "TraceReplaySessionTest"),
+        (trace, "top.mobilegl.plugin.trace", "SpawnServerPath", "SpawnServerPathTest"),
+        (main_src, "top.mobilegl.plugin", "ServerEnvironment", "ServerEnvironmentTest"),
     ]
     with tempfile.TemporaryDirectory(prefix="mobilegl-replay-lifecycle-") as output:
         sources = []
-        for package, unit, test in java_units:
-            sources.append(str(trace / "java" / package.replace(".", "/") / f"{unit}.java"))
+        for source_set, package, unit, test in java_units:
+            sources.append(str(source_set / "java" / package.replace(".", "/") / f"{unit}.java"))
             sources.append(str(root / f"tools/trace_replay/{test}.java"))
         subprocess.run(["javac", "--release", "11", "-d", output, *sources], check=True)
-        for package, _, test in java_units:
+        for _, package, _, test in java_units:
             subprocess.run(["java", "-cp", output, f"{package}.{test}"], check=True)
     print("Android replay manifest and lifecycle checks passed")