commit 1ede4106e4d002ef4d49b73b1d88dc72e88d8df4
author Nick Kralevich <nnk@google.com> Thu Oct 09 19:30:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 09 19:30:12 2014 +0000
tree 028503b53d83e49f563891ccb53379d486360cb9
parent 95d6237108e265799b542f82bcaa26a2033095ef
parent fff9b7bd19b7bbf7f6b1fb2137723b6ac25f6b14

am fff9b7bd: SeccompTest: fix arm64 in arm32 compat mode

* commit 'fff9b7bd19b7bbf7f6b1fb2137723b6ac25f6b14':
  SeccompTest: fix arm64 in arm32 compat mode

tests/tests/os/src/android/os/cts/SeccompTest.java

diff --git a/tests/tests/os/src/android/os/cts/SeccompTest.java b/tests/tests/os/src/android/os/cts/SeccompTest.java
index e2ddcc2..6c49337 100644
--- a/tests/tests/os/src/android/os/cts/SeccompTest.java
+++ b/tests/tests/os/src/android/os/cts/SeccompTest.java
@@ -21,8 +21,8 @@
 public class SeccompTest extends TestCase {
 
     public void testSeccomp() {
-        if (CpuFeatures.isArm64Cpu()) {
-            return; // seccomp not supported on arm64
+        if (CpuFeatures.isArm64Cpu() || CpuFeatures.isArm64CpuIn32BitMode()) {
+            return; // seccomp not yet supported on arm64
         }
         if (OSFeatures.needsSeccompSupport()) {
             assertTrue("Please enable seccomp support "