commit | d47dfc3f61c7a1fe12c3de8046a0cafc19f0672f | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Tue Sep 24 01:03:29 2019 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Sep 24 01:03:29 2019 +0000 |
tree | 709e6d13ebcd554bd9671d2a81f570b2fb5743fe | |
parent | 638961168b7aba436ce3f7c00199125210d95aa6 [diff] | |
parent | a616a8bfd37a1e57f2096502092504e0ca9ceeba [diff] |
Snap for 5895359 from a616a8bfd37a1e57f2096502092504e0ca9ceeba to qt-qpr1-release Change-Id: I41d494adba808ea768512f9f7f0623cdcd5a84fa
diff --git a/support/src/test/java/libcore/java/security/CpuFeatures.java b/support/src/test/java/libcore/java/security/CpuFeatures.java index 4c4c8a00..8ab610f 100644 --- a/support/src/test/java/libcore/java/security/CpuFeatures.java +++ b/support/src/test/java/libcore/java/security/CpuFeatures.java
@@ -44,7 +44,7 @@ } } else if (instructionSet.startsWith("x86")) { // x86 CPUs with the "aes" flag and running in 64bit mode should have hardware AES. - if (VMRuntime.is64BitInstructionSet(instructionSet)) { + if ("x86_64".equals(instructionSet)) { List<String> flags = getListFromCpuinfo("flags"); if (flags != null && flags.contains("aes")) { return true;