Android version required. If struct paths supplied those are used, but version must be supplied.

Author: sam-f0

README.md

@@ -51,7 +51,7 @@ You'll need a rooted Android device or emulator.
 | -d DEVICE       | The device to attach to e.g. "emulator-5554". Use `adb devices` to list available devices. If not provided defaults to the USB device. |
 | -p PID          | The pid of the process on DEVICE to attach to.                                                                                         |
 | -n NAME         | The name of the process on DEVICE to attach to e.g. "Messaging".                                                                       |
-| -a [9, 10, 11, 13]   | The version of android to load structures for.             |
+| -a [9, 10, 11, 12, 13]   | The target device android version. If no struct path is supplied, default structs are used.             |
 | -s STRUCTPATH   | The path to the directory of structure files.             |
 | -c CONFIG   | The path to the config file to filter.             |
 | --spawn     | Spawn process before attaching. -n option **must** be present and contain a valid process identifier.|

binder_trace/binder_trace/__main__.py

@@ -41,17 +41,16 @@ def setupArgParser() -> argparse.ArgumentParser:
         help="the android device to attach to",
     )
 
-    struct_group = parser.add_mutually_exclusive_group(required=True)
-
-    struct_group.add_argument(
+    parser.add_argument(
         "-a",
         "--android-version",
         nargs="?",
         choices=["9", "10", "11", "12", "13", "14"],
         help="Android version structs to use",
+        required=True,
     )
 
-    struct_group.add_argument(
+    parser.add_argument(
         "-s",
         "--structpath",
         help="Provides the path to the root of the struct directory. e.g. ../structs/android11",