fix: droiddeckctl reaches variant-package builds (recover #842) (#854)

fix: droiddeckctl reaches builds shipped under a variant package

The provider authority and the start Activity's component were fixed to
com.droiddeck.launcher, so droiddeckctl could not talk to the antutu,
ludashi or pubg builds from tools/release/variants.txt. DROIDDECK_PACKAGE
now picks the package; the Activity's class name stays the same in every
variant.

Co-authored-by: angelrenefm <17342133+angelrenefm@users.noreply.github.com>
This commit is contained in:
Kurt Himebauchandangelrenefm authored and GitHub committed 2026-10-14 22:15:29 -04:00
1 parent eb22557702
commit d2bab8970d
3 files changed
+16 -3

No files matched your search

+4 -3
View File
@@ -18,8 +18,9 @@ sys.path.insert(0, str(Path(__file__).resolve().parent))
from adb_device import DeviceResolutionError, resolve_serial
AUTHORITY = "content://com.droiddeck.launcher.agent"
PACKAGE = "com.droiddeck.launcher"
# tools/release/variants.txt: the same app also ships as other packages (e.g. com.antutu.benchmark.full).
PACKAGE = os.environ.get("DROIDDECK_PACKAGE", "com.droiddeck.launcher")
AUTHORITY = f"content://{PACKAGE}.agent"
STEAM_CLIENT_APP = 769
REQUEST_CAP = 256 * 1024
@@ -117,7 +118,7 @@ def start_agent_activity(adb: str, serial: str, request: dict) -> None:
"start",
"-W",
"-n",
f"{PACKAGE}/.agent.AgentStartActivity",
f"{PACKAGE}/com.droiddeck.launcher.agent.AgentStartActivity",
"--es",
"request",
encoded,