commit ca7f0f8bb64fa0c39d8a1caec72bdb298ec180d2
author Anton Carver <anton@google.com> Wed Aug 13 18:08:27 2014 +0100
committer Anton Carver <anton@google.com> Fri Aug 15 15:28:52 2014 +0000
tree 6fcfe8c25cc8cf6c6a244450426db894d71a7b54
parent 63c7c02013cb5d9e1a957eb99d6620335b748d71

Test that an application can mmap executable code from its APK.

bug: 16727210 16076402

Change-Id: I0c3bf84e4588aa99c95592c26b6113d33808fe29
(cherry picked from commit c3baa19073a5bec63de7aef86eb1a01530ef714b)

tests/tests/security/jni/CtsSecurityJniOnLoad.cpp

diff --git a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
index 9d00ad6..41a3df9 100644
--- a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
+++ b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
@@ -24,6 +24,7 @@
 extern int register_android_security_cts_LoadEffectLibraryTest(JNIEnv*);
 extern int register_android_security_cts_SeccompDeathTestService(JNIEnv*);
 extern int register_android_security_cts_SELinuxTest(JNIEnv*);
+extern int register_android_security_cts_MMapExecutableTest(JNIEnv* env);
 
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env = NULL;
@@ -60,5 +61,9 @@
         return JNI_ERR;
     }
 
+    if (register_android_security_cts_MMapExecutableTest(env)) {
+        return JNI_ERR;
+    }
+
     return JNI_VERSION_1_4;
 }