From ba3fe56edc1da4dad0d831a1892e7b1c3c20c437 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 12 Aug 2015 14:49:53 -0700
Subject: Lose HAVE_ANDROID_OS from frameworks/base.

Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
---
 tools/aapt/Command.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools/aapt/Command.cpp')

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
 
-- 
cgit v1.2.3-59-g8ed1b