Remove or deprecate android*_both software deps
They are no longer needed because of the introduction of
ExtraSoftwareDeps. This CL also makes "android" deprecated
because of the NP migration.
"arc" will be added for things like chromium:2065069, but
its definition is as simple as just `arc`.
BUG=b:149854594
TEST=try
Cq-Depend: chromium:2067114
Change-Id: I2fe617b04a45bdfeee282fbd55b14d6584868431
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/tast/+/2066157
Tested-by: Yusuke Sato <[email protected]>
Commit-Queue: Yusuke Sato <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
diff --git a/docs/test_dependencies.md b/docs/test_dependencies.md
index 452f166..ce48476 100644
--- a/docs/test_dependencies.md
+++ b/docs/test_dependencies.md
@@ -15,18 +15,19 @@
* `alt_syscall` - Whether the platform supports the alt syscall framework.
* `amd64` - The [amd64] processor architecture.
-* `android` - The ability to [run Android apps]. Any production version of
- Android (i.e. ones except `master-arc-dev`) can be used.
+* `android` - The same as `android_p`. Do not use in new code.
* `android_vm` - The ability to [run Android apps] in VM instead of container.
Any version of Android can be used.
* `android_vm_p` - `android_vm` feature that runs in P VM.
* `android_vm_r` - `android_vm` feature that runs in R VM.
-* `android_both` - `android` feature that runs in both vm and container.
-* `android_all` - in addition to `android`, runs on `master-arc-dev`, too.
-* `android_all_both` - `android_all` feature that runs in both vm and container.
+* `android_both` - Deprecated. Do not use.
+* `android_all` - The ability to [run Android apps] in container. Any version
+ of Android can be used.
* `android_p` - The ability to [run Android apps] that require Android P.
-* `android_p_both` - `android_p` feature that runs in both vm and container.
* `android_r` - The ability to [run Android apps] that require Android Q or R.
+* `arc` - The ability to [run Android apps] in any way, in VM or container,
+ with any Android version. This is intended to be used to run non-ARC tests
+ only when ARC is supported on the board.
* `arc_camera1` - Using [Camera HAL3] in Chrome and [Camera HAL1] in Android.
* `arc_camera3` - Using [Camera HAL3] interface in Chrome and Android.
* `aslr` - Address space layout randomization, which mitigates buffer-overflow
