commit ba3fe56edc1da4dad0d831a1892e7b1c3c20c437
author Elliott Hughes <enh@google.com> Wed Aug 12 14:49:53 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Aug 12 14:49:53 2015 -0700
tree baa26269c62707c7391b442a583968ee11bbc4c0
parent daf8d9056815b7435bdf4d07da3f938f11052691

Lose HAVE_ANDROID_OS from frameworks/base.

Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 8a0a39c..d12ab3b 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -215,7 +215,7 @@
             goto bail;
         }
 
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
         static const bool kHaveAndroidOs = true;
 #else
         static const bool kHaveAndroidOs = false;
@@ -633,7 +633,7 @@
     Asset* asset = NULL;
 
     if (strcmp("resources", option) == 0) {
-#ifndef HAVE_ANDROID_OS
+#ifndef __ANDROID__
         res.print(bundle->getValues());
 #endif