diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-12 14:49:53 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-08-12 14:49:53 -0700 |
| commit | ba3fe56edc1da4dad0d831a1892e7b1c3c20c437 (patch) | |
| tree | baa26269c62707c7391b442a583968ee11bbc4c0 /tools/aapt/Command.cpp | |
| parent | daf8d9056815b7435bdf4d07da3f938f11052691 (diff) | |
Lose HAVE_ANDROID_OS from frameworks/base.
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
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 |