summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java/android
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-02-26 23:32:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-26 23:32:52 +0000
commit663d6f254ddd56b8ce25be36a9b70e6aa2d7e761 (patch)
treeaae60d96600f6117a3d72757e056d66d5a6ba2e8 /luni/src/main/java/android
parent23791cfc4aeabdd8e26b10a651be990cfbc986e0 (diff)
parent91ac2dc4d83f1086f0e7cf86a4289c539de19f85 (diff)
downloadlibcore-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/java/android')
-rw-r--r--luni/src/main/java/android/system/OsConstants.java9
1 files changed, 9 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();