diff options
| author | Nick Kralevich <nnk@google.com> | 2015-02-26 23:32:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-26 23:32:52 +0000 |
| commit | 663d6f254ddd56b8ce25be36a9b70e6aa2d7e761 (patch) | |
| tree | aae60d96600f6117a3d72757e056d66d5a6ba2e8 /luni/src/main | |
| parent | 23791cfc4aeabdd8e26b10a651be990cfbc986e0 (diff) | |
| parent | 91ac2dc4d83f1086f0e7cf86a4289c539de19f85 (diff) | |
| download | libcore-663d6f254ddd56b8ce25be36a9b70e6aa2d7e761.zip libcore-663d6f254ddd56b8ce25be36a9b70e6aa2d7e761.tar.gz libcore-663d6f254ddd56b8ce25be36a9b70e6aa2d7e761.tar.bz2 | |
am 91ac2dc4: am aa71da43: am a3783569: Merge "Add ST_* constants to OsConstants"
* commit '91ac2dc4d83f1086f0e7cf86a4289c539de19f85':
Add ST_* constants to OsConstants
Diffstat (limited to 'luni/src/main')
| -rw-r--r-- | luni/src/main/java/android/system/OsConstants.java | 9 | ||||
| -rw-r--r-- | luni/src/main/native/android_system_OsConstants.cpp | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/luni/src/main/java/android/system/OsConstants.java b/luni/src/main/java/android/system/OsConstants.java index 55870ec..8389e5f 100644 --- a/luni/src/main/java/android/system/OsConstants.java +++ b/luni/src/main/java/android/system/OsConstants.java @@ -434,6 +434,15 @@ public final class OsConstants { public static final int STDERR_FILENO = placeholder(); public static final int STDIN_FILENO = placeholder(); public static final int STDOUT_FILENO = placeholder(); + /** @hide */ public static final int ST_MANDLOCK = placeholder(); + /** @hide */ public static final int ST_NOATIME = placeholder(); + /** @hide */ public static final int ST_NODEV = placeholder(); + /** @hide */ public static final int ST_NODIRATIME = placeholder(); + /** @hide */ public static final int ST_NOEXEC = placeholder(); + /** @hide */ public static final int ST_NOSUID = placeholder(); + /** @hide */ public static final int ST_RDONLY = placeholder(); + /** @hide */ public static final int ST_RELATIME = placeholder(); + /** @hide */ public static final int ST_SYNCHRONOUS = placeholder(); public static final int S_IFBLK = placeholder(); public static final int S_IFCHR = placeholder(); public static final int S_IFDIR = placeholder(); diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp index f00c922..46dabb3 100644 --- a/luni/src/main/native/android_system_OsConstants.cpp +++ b/luni/src/main/native/android_system_OsConstants.cpp @@ -491,6 +491,15 @@ static void OsConstants_initConstants(JNIEnv* env, jclass c) { initConstant(env, c, "STDERR_FILENO", STDERR_FILENO); initConstant(env, c, "STDIN_FILENO", STDIN_FILENO); initConstant(env, c, "STDOUT_FILENO", STDOUT_FILENO); + initConstant(env, c, "ST_MANDLOCK", ST_MANDLOCK); + initConstant(env, c, "ST_NOATIME", ST_NOATIME); + initConstant(env, c, "ST_NODEV", ST_NODEV); + initConstant(env, c, "ST_NODIRATIME", ST_NODIRATIME); + initConstant(env, c, "ST_NOEXEC", ST_NOEXEC); + initConstant(env, c, "ST_NOSUID", ST_NOSUID); + initConstant(env, c, "ST_RDONLY", ST_RDONLY); + initConstant(env, c, "ST_RELATIME", ST_RELATIME); + initConstant(env, c, "ST_SYNCHRONOUS", ST_SYNCHRONOUS); initConstant(env, c, "S_IFBLK", S_IFBLK); initConstant(env, c, "S_IFCHR", S_IFCHR); initConstant(env, c, "S_IFDIR", S_IFDIR); |