Revert "perf(android): target bundletool builds to device (#658)"

src/launchpad/utils/android/bundletool.py

@@ -170,10 +170,6 @@ def build_apks(
         with tempfile.TemporaryDirectory(prefix="bundletool-") as temp_dir:
             temp_dir_path = Path(temp_dir)
             temp_apks_path = temp_dir_path / "apks.apks"
-            device_spec_path = temp_dir_path / "device-spec.json"
-            with open(device_spec_path, "w", encoding="utf-8") as device_spec_file:
-                json.dump(device_spec.model_dump(by_alias=True), device_spec_file)
-
             build_apks_command = [
                 "build-apks",
                 f"--bundle={bundle_path}",
@@ -182,10 +178,6 @@ def build_apks(
 
             if universal_apk:
                 build_apks_command.append("--mode=universal")
-            else:
-                # Restrict bundletool to APKs matching the target device instead
-                # of generating every possible split before extract-apks filters them.
-                build_apks_command.append(f"--device-spec={device_spec_path}")
 
             # Generate keystore and sign APKs if requested
             if sign_apks:
@@ -203,6 +195,10 @@ def build_apks(
 
                 logger.debug("APKs will be signed with generated keystore")
 
+            device_spec_path = temp_dir_path / "device-spec.json"
+            with open(device_spec_path, "w", encoding="utf-8") as device_spec_file:
+                json.dump(device_spec.model_dump(by_alias=True), device_spec_file)
+
             self._run_command(build_apks_command)
 
             # Extract APKs for the specified device