Fix VersionAwareTransport across codebase, consolidate CI into Makefile

- Fix all 12 examples to use versionaware.NewTransport
- Fix servicemanager mock test to implement ResolveCode
- Fix API detection to handle both build_flags.json schemas
  (API 35 "flag_artifacts" and API 36 "flags")
- Fix service methods: reverse-lookup knownServiceNames when
  InterfaceTransaction returns empty
- Fix telephony example flags to match generated code
- Consolidate CI: move all commands into Makefile targets
  (test, vet, build, check-generated, release), CI just calls make
- Build outputs go to builds/ directory

Author: xaionaro@dx.center

.github/workflows/ci.yml

@@ -24,28 +24,16 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: Unit tests
-        run: go test -v -race $(go list -e ./tools/pkg/... | grep -v /3rdparty/) ./binder/ ./parcel/
+        run: make test
 
       - name: Vet
-        run: go vet $(go list -e ./tools/pkg/... ./tools/... | grep -v /3rdparty/) ./binder/ ./parcel/ ./kernelbinder/ ./servicemanager/ ./errors/
+        run: make vet
 
-      - name: Build commands and tools
-        run: go build ./tools/cmd/...
-
-      - name: Build examples
-        run: |
-          for d in examples/*/; do
-            echo "Building $d..."
-            go build "./$d"
-          done
+      - name: Build
+        run: make build
 
       - name: Verify generated code is up to date
-        run: |
-          make clean
-          make generate
-          make smoke
-          make readme
-          git diff --exit-code
+        run: make check-generated
 
   release:
     needs: test
@@ -63,15 +51,13 @@ jobs:
         with:
           go-version: '1.25.x'
 
-      - name: Build aidlcli binaries
-        run: |
-          CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o aidlcli-linux-arm64 ./cmd/aidlcli/
-          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o aidlcli-linux-amd64 ./cmd/aidlcli/
+      - name: Build release binaries
+        run: make release
 
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            aidlcli-linux-arm64
-            aidlcli-linux-amd64
+            builds/aidlcli-linux-arm64
+            builds/aidlcli-linux-amd64
           generate_release_notes: true

.gitignore

@@ -3,3 +3,4 @@
 *.test
 *.out
 *.prof
+/builds/

Makefile

@@ -1,19 +1,39 @@
-.PHONY: generate test e2e lint clean readme smoke aidlcli genaidlcli list-commands
+.PHONY: generate test e2e vet build build-examples lint clean readme smoke \
+       aidlcli genaidlcli list-commands check-generated release
 
 # Generated top-level directories.
 GENERATED_DIRS := android com fuzztest libgui_test_server parcelables src
 
+# All non-3rdparty Go packages.
+GO_PACKAGES = $(shell go list -e ./... | grep -v /3rdparty/)
+
 # Generate all Go code from AOSP AIDL definitions.
 generate:
 	go run ./tools/cmd/aospgen -3rdparty tools/pkg/3rdparty -output . -smoke-tests
 
 # Run unit tests (compiler + runtime packages).
 test:
-	go test ./tools/pkg/... ./binder/... ./parcel/... ./kernelbinder/... ./servicemanager/... ./errors/...
+	go test -v -race $(GO_PACKAGES)
 
-# Run E2E tests (requires /dev/binder or mock mode).
+# Run E2E tests (requires Android emulator or device).
 e2e:
-	go test -tags e2e ./tests/e2e/... -count=1
+	go test -tags e2e ./tests/e2e/... -run TestAidlcli -v -timeout 300s
+
+# Run go vet on all packages.
+vet:
+	go vet $(GO_PACKAGES)
+
+# Build all commands, tools, and examples.
+build:
+	go build ./tools/cmd/...
+	go build ./cmd/...
+	@for d in examples/*/; do echo "Building $$d..."; go build "./$$d"; done
+
+# Build aidlcli release binaries for arm64 and amd64.
+release:
+	@mkdir -p builds
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o builds/aidlcli-linux-arm64 ./cmd/aidlcli/
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o builds/aidlcli-linux-amd64 ./cmd/aidlcli/
 
 # Run linter.
 lint:
@@ -33,12 +53,21 @@ genaidlcli:
 
 # Build the aidlcli tool.
 aidlcli:
-	go build -o aidlcli ./cmd/aidlcli
+	@mkdir -p builds
+	go build -o builds/aidlcli ./cmd/aidlcli
 
 # List all available aidlcli subcommands.
 list-commands:
 	go run ./cmd/aidlcli --help 2>&1 | grep '^ ' | awk '{print $$1}'
 
+# Verify generated code matches a clean regeneration.
+check-generated:
+	make clean
+	make generate
+	make smoke
+	make readme
+	git diff --exit-code
+
 # Remove all generated code.
 clean:
 	rm -rf $(GENERATED_DIRS)

binder/versionaware/apilevel.go

@@ -29,21 +29,26 @@ func detectViaBuildFlags() int {
 	return 0
 }
 
-// buildFlags is the top-level structure of /etc/build_flags.json.
-type buildFlags struct {
-	Flags []buildFlag `json:"flags"`
+// buildFlagsFile handles two JSON schemas found on Android devices:
+//   - API 36+ (Pixel 8a): {"flags": [{"flag_declaration": {...}, "value": {...}}]}
+//   - API 35  (emulator): {"flag_artifacts": [{"flag_declaration": {...}, "val": {...}}]}
+type buildFlagsFile struct {
+	Flags         []buildFlagEntry `json:"flags"`
+	FlagArtifacts []buildFlagEntry `json:"flag_artifacts"`
 }
 
-type buildFlag struct {
+type buildFlagEntry struct {
 	Declaration buildFlagDeclaration `json:"flag_declaration"`
-	Value       buildFlagValue       `json:"value"`
+	// "value" (API 36 schema) or "val" (API 35 schema) — try both.
+	Value buildFlagVal `json:"value"`
+	Val   buildFlagVal `json:"val"`
 }
 
 type buildFlagDeclaration struct {
 	Name string `json:"name"`
 }
 
-type buildFlagValue struct {
+type buildFlagVal struct {
 	Val map[string]json.RawMessage `json:"Val"`
 }
 
@@ -53,19 +58,28 @@ func parseBuildFlags(path string) int {
 		return 0
 	}
 
-	var flags buildFlags
-	if err := json.Unmarshal(data, &flags); err != nil {
+	var file buildFlagsFile
+	if err := json.Unmarshal(data, &file); err != nil {
 		return 0
 	}
 
-	for _, f := range flags.Flags {
+	// Merge both arrays — one will be empty depending on the schema.
+	entries := append(file.Flags, file.FlagArtifacts...)
+
+	for _, f := range entries {
 		if f.Declaration.Name != "RELEASE_PLATFORM_SDK_VERSION" {
 			continue
 		}
+
+		// Try "value" field first (API 36 schema), then "val" (API 35 schema).
 		raw, ok := f.Value.Val["StringValue"]
+		if !ok {
+			raw, ok = f.Val.Val["StringValue"]
+		}
 		if !ok {
 			return 0
 		}
+
 		var s string
 		if err := json.Unmarshal(raw, &s); err != nil {
 			return 0

examples/activity_manager/main.go

@@ -12,6 +12,7 @@ import (
 	"os"
 
 	"github.com/xaionaro-go/aidl/binder"
+	"github.com/xaionaro-go/aidl/binder/versionaware"
 	"github.com/xaionaro-go/aidl/android/app"
 	"github.com/xaionaro-go/aidl/kernelbinder"
 	"github.com/xaionaro-go/aidl/servicemanager"
@@ -32,7 +33,13 @@ func main() {
 	}
 	defer driver.Close(ctx)
 
-	sm := servicemanager.New(driver)
+	transport, err := versionaware.NewTransport(ctx, driver, 0)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "version-aware transport: %v\n", err)
+		os.Exit(1)
+	}
+
+	sm := servicemanager.New(transport)
 
 	svc, err := sm.GetService(ctx, "activity")
 	if err != nil {

examples/audio_status/main.go

@@ -12,6 +12,7 @@ import (
 	"os"
 
 	"github.com/xaionaro-go/aidl/binder"
+	"github.com/xaionaro-go/aidl/binder/versionaware"
 	"github.com/xaionaro-go/aidl/android/media"
 	"github.com/xaionaro-go/aidl/kernelbinder"
 	"github.com/xaionaro-go/aidl/servicemanager"
@@ -45,7 +46,13 @@ func main() {
 	}
 	defer driver.Close(ctx)
 
-	sm := servicemanager.New(driver)
+	transport, err := versionaware.NewTransport(ctx, driver, 0)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "version-aware transport: %v\n", err)
+		os.Exit(1)
+	}
+
+	sm := servicemanager.New(transport)
 
 	svc, err := sm.GetService(ctx, "audio")
 	if err != nil {

examples/battery_health/main.go

@@ -12,6 +12,7 @@ import (
 	"os"
 
 	"github.com/xaionaro-go/aidl/binder"
+	"github.com/xaionaro-go/aidl/binder/versionaware"
 	"github.com/xaionaro-go/aidl/android/hardware/health"
 	"github.com/xaionaro-go/aidl/kernelbinder"
 	"github.com/xaionaro-go/aidl/servicemanager"
@@ -27,7 +28,13 @@ func main() {
 	}
 	defer driver.Close(ctx)
 
-	sm := servicemanager.New(driver)
+	transport, err := versionaware.NewTransport(ctx, driver, 0)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "version-aware transport: %v\n", err)
+		os.Exit(1)
+	}
+
+	sm := servicemanager.New(transport)
 
 	svc, err := sm.GetService(ctx, "android.hardware.health.IHealth/default")
 	if err != nil {

examples/device_info/main.go

@@ -13,6 +13,7 @@ import (
 	"os"
 
 	"github.com/xaionaro-go/aidl/binder"
+	"github.com/xaionaro-go/aidl/binder/versionaware"
 	"github.com/xaionaro-go/aidl/android/hardware/input"
 	"github.com/xaionaro-go/aidl/android/location"
 	genOs "github.com/xaionaro-go/aidl/android/os"
@@ -31,7 +32,13 @@ func main() {
 	}
 	defer driver.Close(ctx)
 
-	sm := servicemanager.New(driver)
+	transport, err := versionaware.NewTransport(ctx, driver, 0)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "version-aware transport: %v\n", err)
+		os.Exit(1)
+	}
+
+	sm := servicemanager.New(transport)
 
 	// Thermal status
 	thermalSvc, err := sm.GetService(ctx, "thermalservice")

examples/display_info/main.go

@@ -12,6 +12,7 @@ import (
 	"os"
 
 	"github.com/xaionaro-go/aidl/binder"
+	"github.com/xaionaro-go/aidl/binder/versionaware"
 	"github.com/xaionaro-go/aidl/android/hardware/display"
 	"github.com/xaionaro-go/aidl/kernelbinder"
 	"github.com/xaionaro-go/aidl/servicemanager"
@@ -27,7 +28,13 @@ func main() {
 	}
 	defer driver.Close(ctx)
 
-	sm := servicemanager.New(driver)
+	transport, err := versionaware.NewTransport(ctx, driver, 0)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "version-aware transport: %v\n", err)
+		os.Exit(1)
+	}
+
+	sm := servicemanager.New(transport)
 
 	// Display Manager — display IDs and brightness
 	svc, err := sm.GetService(ctx, "display")

examples/list_services/main.go

@@ -12,6 +12,7 @@ import (
 	"os"
 
 	"github.com/xaionaro-go/aidl/binder"
+	"github.com/xaionaro-go/aidl/binder/versionaware"
 	"github.com/xaionaro-go/aidl/kernelbinder"
 	"github.com/xaionaro-go/aidl/servicemanager"
 )
@@ -26,7 +27,13 @@ func main() {
 	}
 	defer driver.Close(ctx)
 
-	sm := servicemanager.New(driver)
+	transport, err := versionaware.NewTransport(ctx, driver, 0)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "version-aware transport: %v\n", err)
+		os.Exit(1)
+	}
+
+	sm := servicemanager.New(transport)
 
 	services, err := sm.ListServices(ctx)
 	if err != nil {