diff options
| author | 2015-08-12 23:56:18 +0000 | |
|---|---|---|
| committer | 2015-08-12 23:56:18 +0000 | |
| commit | 4c807349bdd46ff818edfed63e9193a1a5b67a9f (patch) | |
| tree | b5ed3585d03489a7ebd27dcfbb1c0efb9b9fa2d4 /tools/aapt/Command.cpp | |
| parent | 8cf6d865cfb3c05034f947b81de8ca09a92037a0 (diff) | |
| parent | 344d347af22705aa2fa80602d27a5682a72b5f69 (diff) | |
am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
Lose HAVE_ANDROID_OS from frameworks/base.
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 8a0a39cfb445..d12ab3b725c8 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -215,7 +215,7 @@ int doList(Bundle* bundle) goto bail; } -#ifdef HAVE_ANDROID_OS +#ifdef __ANDROID__ static const bool kHaveAndroidOs = true; #else static const bool kHaveAndroidOs = false; @@ -633,7 +633,7 @@ int doDump(Bundle* bundle) Asset* asset = NULL; if (strcmp("resources", option) == 0) { -#ifndef HAVE_ANDROID_OS +#ifndef __ANDROID__ res.print(bundle->getValues()); #endif |