Adding arm64-v8a-hwasan abi memory mapping
missing this breaks AOSP builds with vendor source since their 'ro.product.cpu.abilist' is 'arm64-v8a-hwasan,arm64-v8a'
also:throw an exception when no matching abi is found to make it easier to debug
Bug:335546258
Change-Id: Ieea4b23c0b1a5ca3900bd61b7856a8ada48de915
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 29e9014..0503690 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -2445,16 +2445,16 @@
}
private long minMemoryRequired() {
- if (Build.SUPPORTED_ABIS.length > 0) {
- String primaryAbi = Build.SUPPORTED_ABIS[0];
- switch (primaryAbi) {
- case "x86_64":
- return MIN_MEM_X86_64;
- case "arm64-v8a":
- return MIN_MEM_ARM64;
- }
- }
- return 0;
+ assertThat(Build.SUPPORTED_ABIS).isNotEmpty();
+ String primaryAbi = Build.SUPPORTED_ABIS[0];
+ switch (primaryAbi) {
+ case "x86_64":
+ return MIN_MEM_X86_64;
+ case "arm64-v8a":
+ case "arm64-v8a-hwasan":
+ return MIN_MEM_ARM64;
+ }
+ throw new AssertionError("Unsupported ABI: " + primaryAbi);
}
}