diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-07-13 11:06:57 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-07-13 19:45:44 -0400 |
| commit | c1b9bbb21c8ad5109978a4e9e770cd18b0257434 (patch) | |
| tree | bfb7dd2272e5fe29d3c0fc4f22ca708e00bc10be /core/jni/com_android_internal_os_ZygoteInit.cpp | |
| parent | b6e5e7a740bf595a1a5d32b28549e5d579a04ee3 (diff) | |
| download | frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.zip frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.tar.gz frameworks_base-c1b9bbb21c8ad5109978a4e9e770cd18b0257434.tar.bz2 | |
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'core/jni/com_android_internal_os_ZygoteInit.cpp')
| -rw-r--r-- | core/jni/com_android_internal_os_ZygoteInit.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/jni/com_android_internal_os_ZygoteInit.cpp b/core/jni/com_android_internal_os_ZygoteInit.cpp index 86fd9cb..7e5dede 100644 --- a/core/jni/com_android_internal_os_ZygoteInit.cpp +++ b/core/jni/com_android_internal_os_ZygoteInit.cpp @@ -27,13 +27,11 @@ #include <JNIHelp.h> #include "android_runtime/AndroidRuntime.h" -#ifdef HAVE_ANDROID_OS #include <linux/capability.h> #include <linux/prctl.h> #include <sys/prctl.h> extern "C" int capget(cap_user_header_t hdrp, cap_user_data_t datap); extern "C" int capset(cap_user_header_t hdrp, const cap_user_data_t datap); -#endif namespace android { @@ -168,7 +166,6 @@ static void com_android_internal_os_ZygoteInit_setCloseOnExec (JNIEnv *env, static void com_android_internal_os_ZygoteInit_setCapabilities (JNIEnv *env, jobject clazz, jlong permitted, jlong effective) { -#ifdef HAVE_ANDROID_OS struct __user_cap_header_struct capheader; struct __user_cap_data_struct capdata; int err; @@ -190,15 +187,11 @@ static void com_android_internal_os_ZygoteInit_setCapabilities (JNIEnv *env, jniThrowIOException(env, errno); return; } -#endif /* HAVE_ANDROID_OS */ } static jlong com_android_internal_os_ZygoteInit_capgetPermitted (JNIEnv *env, jobject clazz, jint pid) { -#ifndef HAVE_ANDROID_OS - return (jlong)0; -#else struct __user_cap_header_struct capheader; struct __user_cap_data_struct capdata; int err; @@ -217,7 +210,6 @@ static jlong com_android_internal_os_ZygoteInit_capgetPermitted (JNIEnv *env, } return (jlong) capdata.permitted; -#endif /* HAVE_ANDROID_OS */ } static jint com_android_internal_os_ZygoteInit_selectReadable ( |