Fix e2e target to run on real device via adb

Detect /dev/binder in TestMain to skip emulator setup when running
on-device. bindercli tests skip automatically. Split into make e2e
(device) and make e2e-bindercli (emulator).

Author: xaionaro@dx.center

Makefile

@@ -1,4 +1,4 @@
-.PHONY: generate genversions test e2e vet build build-examples lint clean readme smoke \
+.PHONY: generate genversions test e2e e2e-bindercli vet build build-examples lint clean readme smoke \
        bindercli genbindercli genservicemap genaccessors list-commands check-generated release
 
 # Generated top-level directories.
@@ -19,9 +19,18 @@ generate:
 test:
 	go test -v -race $(GO_PACKAGES)
 
-# Run E2E tests (requires Android emulator or device).
+# Run E2E tests on a connected device via adb.
+# Cross-compiles the test binary, pushes it, and runs on the device.
+# bindercli tests are skipped (they require an emulator); on-device tests
+# open /dev/binder directly.
 e2e:
-	go test -tags e2e ./tests/e2e/... -run TestAidlcli -v -timeout 300s
+	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go test -tags e2e -c -o build/e2e_test ./tests/e2e/
+	adb push build/e2e_test /data/local/tmp/
+	adb shell /data/local/tmp/e2e_test -test.v -test.timeout 300s
+
+# Run bindercli E2E tests via emulator (starts emulator if needed).
+e2e-bindercli:
+	go test -tags e2e ./tests/e2e/... -run TestBindercli -v -timeout 300s
 
 # Run go vet on all packages.
 vet:

tests/e2e/aidlcli_test.go

@@ -34,7 +34,20 @@ var emulatorSerial string
 // so cleanup only kills it if we own it.
 var emulatorStartedByTest bool
 
+// onDevice reports whether the test binary is running directly on an
+// Android device (i.e. /dev/binder is accessible). When true, the
+// emulator/adb setup is skipped — on-device tests open /dev/binder
+// directly, and aidlcli tests are skipped.
+var onDevice bool
+
 func TestMain(m *testing.M) {
+	if _, err := os.Stat("/dev/binder"); err == nil {
+		// Running on the device itself — skip emulator setup.
+		onDevice = true
+		os.Exit(m.Run())
+	}
+
+	// Running on the host — need emulator for aidlcli tests.
 	serial := findEmulator()
 	if serial == "" {
 		startEmulator()
@@ -217,9 +230,13 @@ func shellQuote(s string) string {
 	return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"
 }
 
-// runBindercliOrSkip runs bindercli; skips the test when the service is unavailable.
+// runBindercliOrSkip runs bindercli; skips the test when the service is unavailable
+// or when running directly on the device (aidlcli tests require adb from the host).
 func runBindercliOrSkip(t *testing.T, args ...string) string {
 	t.Helper()
+	if onDevice {
+		t.Skip("bindercli tests require adb from host; skipping on-device")
+	}
 	stdout, stderr, err := runBindercli(args...)
 	if err != nil {
 		combined := stderr + stdout
@@ -685,6 +702,9 @@ func runBindercliHALOrSkip(
 	args ...string,
 ) string {
 	t.Helper()
+	if onDevice {
+		t.Skip("bindercli tests require adb from host; skipping on-device")
+	}
 	fullArgs := append([]string{serviceName}, args...)
 	stdout, stderr, err := runBindercli(fullArgs...)
 	if err != nil {