summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-17 21:15:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-17 21:15:40 +0000
commit84d4917c7560da364eb8fe79353e046807beb416 (patch)
tree209739704a79f211773a4ed6f08f78724cbe6bcc /tools/aapt/Resource.cpp
parentcd3f875321a30f9cc21e631fa85f7fb12901b147 (diff)
parent12cf0f9c4cf8e6aed738da7349f556bd716ec09e (diff)
am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e': Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r--tools/aapt/Resource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 5d208152e084..a4e5d3de69c1 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -2682,7 +2682,7 @@ status_t writeResourceSymbols(Bundle* bundle, const sp<AaptAssets>& assets,
if (s > last && (*s == '.' || *s == 0)) {
String8 part(last, s-last);
dest.appendPath(part);
-#ifdef HAVE_MS_C_RUNTIME
+#ifdef _WIN32
_mkdir(dest.string());
#else
mkdir(dest.string(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);