OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
127a0d1
)
Move aapt2 off HAVE_MS_C_RUNTIME.
author
Elliott Hughes
<enh@google.com>
Wed, 19 Aug 2015 17:38:36 +0000
(10:38 -0700)
committer
Elliott Hughes
<enh@google.com>
Wed, 19 Aug 2015 17:38:36 +0000
(10:38 -0700)
Change-Id: Iea75251bde4d8795213ea235db446065e1fea7b5
tools/aapt2/Files.cpp
patch
|
blob
|
history
diff --git
a/tools/aapt2/Files.cpp
b/tools/aapt2/Files.cpp
index
8484148
..
b24ff6b
100644
(file)
--- a/
tools/aapt2/Files.cpp
+++ b/
tools/aapt2/Files.cpp
@@
-22,7
+22,7
@@
#include <string>
#include <sys/stat.h>
-#ifdef
HAVE_MS_C_RUNTIME
+#ifdef
_WIN32
// Windows includes.
#include <direct.h>
#endif
@@
-83,7
+83,7
@@
std::vector<std::string> listFiles(const StringPiece& root) {
}
inline static int mkdirImpl(const StringPiece& path) {
-#ifdef
HAVE_MS_C_RUNTIME
+#ifdef
_WIN32
return _mkdir(path.toString().c_str());
#else
return mkdir(path.toString().c_str(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);