commit 31aa9e7d561122b8fe71c9cbed64d14a086fb3f9
author Nick Kralevich <nnk@google.com> Sun Jul 13 02:30:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Jul 13 02:30:54 2014 +0000
tree 4fcf7fc917444a8540e06a00f0a00067afb8f50c
parent aee2a6eeaf13a4a8bd8bf015de16e02a507496e4
parent 7ba45d63aa8e8098eb21fd4081b23f5d5267f8b6

am 7ba45d63: am 4743ee44: am eac3f9ec: am add7e67f: am 24fa31b2: am 36fe6994: Merge "fix arm64 build" into jb-dev

* commit '7ba45d63aa8e8098eb21fd4081b23f5d5267f8b6':
  fix arm64 build

tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp

diff --git a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
index 96c2bfc..7f566fd 100644
--- a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
@@ -104,6 +104,7 @@
  */
 static jboolean android_security_cts_NativeCodeTest_doVrootTest(JNIEnv*, jobject)
 {
+#ifdef __arm__
     ALOGE("Starting doVrootTest");
 
     struct __sysctl_args args;
@@ -118,6 +119,9 @@
 
     int result = syscall(__NR__sysctl, &args);
     return ((result == -1) && (errno == EFAULT));
+#else
+    return true;
+#endif
 }
 
 static void* mmap_syscall(void* addr, size_t len, int prot, int flags, int fd, off_t offset)