diff options
| author | Stephen Hines <srhines@google.com> | 2014-10-02 12:41:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 12:41:58 +0000 |
| commit | f08384c763d2e57c05e0be4325c267d12fc516d4 (patch) | |
| tree | 239debb53181f087a472ee32ee385b4e6b4b4819 | |
| parent | 594d2a5690a720002eac49c0666323accd8904cd (diff) | |
| parent | 25a8e43b13e719ff97edd174f8b1ed175e6f91b0 (diff) | |
| download | frameworks_base-f08384c763d2e57c05e0be4325c267d12fc516d4.zip frameworks_base-f08384c763d2e57c05e0be4325c267d12fc516d4.tar.gz frameworks_base-f08384c763d2e57c05e0be4325c267d12fc516d4.tar.bz2 | |
am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev
* commit '25a8e43b13e719ff97edd174f8b1ed175e6f91b0':
include direct.h for _mkdir
| -rw-r--r-- | tools/aapt/CacheUpdater.h | 3 | ||||
| -rw-r--r-- | tools/aidl/aidl.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt/CacheUpdater.h b/tools/aapt/CacheUpdater.h index 0af5872..cacab03 100644 --- a/tools/aapt/CacheUpdater.h +++ b/tools/aapt/CacheUpdater.h @@ -12,6 +12,9 @@ #include <sys/stat.h> #include <stdio.h> #include "Images.h" +#ifdef HAVE_MS_C_RUNTIME +#include <direct.h> +#endif using namespace android; diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index 9c1867e..45dd23b 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -16,6 +16,7 @@ #ifdef HAVE_MS_C_RUNTIME #include <io.h> +#include <direct.h> #include <sys/stat.h> #endif |