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/android_os_FileUtils.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/android_os_FileUtils.cpp')
-rw-r--r-- | core/jni/android_os_FileUtils.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/core/jni/android_os_FileUtils.cpp b/core/jni/android_os_FileUtils.cpp index 89dce89..8d65cbc 100644 --- a/core/jni/android_os_FileUtils.cpp +++ b/core/jni/android_os_FileUtils.cpp @@ -28,11 +28,8 @@ #include <sys/types.h> #include <fcntl.h> #include <signal.h> - -#if HAVE_ANDROID_OS #include <sys/ioctl.h> #include <linux/msdos_fs.h> -#endif namespace android { @@ -53,7 +50,6 @@ jint android_os_FileUtils_setPermissions(JNIEnv* env, jobject clazz, jstring file, jint mode, jint uid, jint gid) { - #if HAVE_ANDROID_OS const jchar* str = env->GetStringCritical(file, 0); String8 file8; if (str) { @@ -70,15 +66,11 @@ jint android_os_FileUtils_setPermissions(JNIEnv* env, jobject clazz, } } return chmod(file8.string(), mode) == 0 ? 0 : errno; - #else - return ENOSYS; - #endif } jint android_os_FileUtils_getPermissions(JNIEnv* env, jobject clazz, jstring file, jintArray outArray) { - #if HAVE_ANDROID_OS const jchar* str = env->GetStringCritical(file, 0); String8 file8; if (str) { @@ -107,9 +99,6 @@ jint android_os_FileUtils_getPermissions(JNIEnv* env, jobject clazz, } env->ReleasePrimitiveArrayCritical(outArray, array, 0); return 0; - #else - return ENOSYS; - #endif } jint android_os_FileUtils_setUMask(JNIEnv* env, jobject clazz, jint mask) @@ -119,7 +108,6 @@ jint android_os_FileUtils_setUMask(JNIEnv* env, jobject clazz, jint mask) jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring path) { - #if HAVE_ANDROID_OS if (path == NULL) { jniThrowException(env, "java/lang/IllegalArgumentException", NULL); return -1; @@ -137,9 +125,6 @@ jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring pat env->ReleaseStringUTFChars(path, pathStr); return result; - #else - return -1; - #endif } jboolean android_os_FileUtils_getFileStatus(JNIEnv* env, jobject clazz, jstring path, jobject fileStatus) { |