diff options
| author | 2015-08-17 12:41:46 -0700 | |
|---|---|---|
| committer | 2015-08-17 12:41:46 -0700 | |
| commit | e17788ceff5c676f3783e5aa25d57a613e9f59db (patch) | |
| tree | 5c02145f2500a7c1021415980ab28706b6a0bffb /tools/aapt | |
| parent | e3f0a881c20072a644317330ecf7409c81e96888 (diff) | |
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/CacheUpdater.h | 4 | ||||
| -rw-r--r-- | tools/aapt/Resource.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/XMLNode.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt/CacheUpdater.h b/tools/aapt/CacheUpdater.h index fade53ac2629..10a1bbc2f4aa 100644 --- a/tools/aapt/CacheUpdater.h +++ b/tools/aapt/CacheUpdater.h @@ -12,7 +12,7 @@ #include <sys/stat.h> #include <stdio.h> #include "Images.h" -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 #include <direct.h> #endif @@ -81,7 +81,7 @@ public: // Advance to the next segment of the path existsPath.appendPath(toCreate.walkPath(&remains)); toCreate = remains; -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 _mkdir(existsPath.string()); #else mkdir(existsPath.string(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP); diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index beb94fdbcfc5..aa7778f9114d 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); diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index bf31bc137fa8..1860147dc2ee 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -12,7 +12,7 @@ #include <errno.h> #include <string.h> -#ifndef HAVE_MS_C_RUNTIME +#ifndef _WIN32 #define O_BINARY 0 #endif |