commit 49df2d893968bd219d191bb40a03f8a55c6ebfee
author Martin Stjernholm <mast@google.com> Fri Sep 09 19:52:06 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 09 19:52:06 2022 +0000
tree 7c0490dadc25a257782afe9bfe04f7e2beb66a8f
parent 8f6c4da259b8afcbe11406c356171aa13359caa2
parent 6f6e8509a78032e0af2219d4e05227b9b0ea8b7e

Use a better property to find the ABI in the fallback. am: b814b5eca0 am: 72c5cd630f am: 69bb52b0b2 am: 0859743a8f am: 6f6e8509a7

Original change: https://android-review.googlesource.com/c/platform/art/+/2208695

Change-Id: Ied06e6eab7be112113881e37ca56491d3c5145eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libnativeloader/test/src/android/test/hostside/LibnativeloaderTest.java

diff --git a/libnativeloader/test/src/android/test/hostside/LibnativeloaderTest.java b/libnativeloader/test/src/android/test/hostside/LibnativeloaderTest.java
index 7e2d9de..06cdea3 100644
--- a/libnativeloader/test/src/android/test/hostside/LibnativeloaderTest.java
+++ b/libnativeloader/test/src/android/test/hostside/LibnativeloaderTest.java
@@ -215,7 +215,7 @@
             if (mTestArch == null) {
                 IAbi abi = mContext.getConfigurationDescriptor().getAbi();
                 mTestArch = abi != null ? abi.getName()
-                                        : assertCommandSucceeds("getprop ro.bionic.arch");
+                                        : assertCommandSucceeds("getprop ro.product.cpu.abi");
             }
             return mTestArch;
         }