From ed3b563093f762ba5291263a03c530d3a3931bb3 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 20 Sep 2019 11:24:28 -0700
Subject: libbinder: __ANDROID_HOST__ => !__ANDROID__

Slightly simplifies config and probably makes more sense.

Bug: 124524556
Test: mma (continues to build on host)
Change-Id: Id11dbc25b581919ce8814c9c9bca191071434142
---
 libs/binder/Android.bp                             |  3 ---
 libs/binder/IServiceManager.cpp                    | 12 ++++++------
 libs/binder/include/private/binder/binder_module.h |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 8af2872152..f3d4b7e3c4 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -102,9 +102,6 @@ cc_library_shared {
         android: {
             srcs: libbinder_device_interface_sources,
         },
-        host: {
-            cflags: ["-D__ANDROID_HOST__"],
-        },
         vendor: {
             exclude_srcs: libbinder_device_interface_sources,
         },
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index b6f3d7b266..f3e8f45909 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -30,7 +30,7 @@
 #include <binder/IPermissionController.h>
 #endif
 
-#ifndef __ANDROID_HOST__
+#ifdef __ANDROID__
 #include <cutils/properties.h>
 #endif
 
@@ -63,7 +63,7 @@ sp<IServiceManager> defaultServiceManager()
     return gDefaultServiceManager;
 }
 
-#if !defined(__ANDROID_VNDK__) && !defined(__ANDROID_HOST__)
+#if !defined(__ANDROID_VNDK__) && defined(__ANDROID__)
 // IPermissionController is not accessible to vendors
 
 bool checkCallingPermission(const String16& permission)
@@ -166,14 +166,14 @@ public:
         const bool isVendorService =
             strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;
         const long timeout = uptimeMillis() + 5000;
+        // Vendor code can't access system properties
         if (!gSystemBootCompleted && !isVendorService) {
-#ifdef __ANDROID_HOST__
-            gSystemBootCompleted = true;
-#else
-            // Vendor code can't access system properties
+#ifdef __ANDROID__
             char bootCompleted[PROPERTY_VALUE_MAX];
             property_get("sys.boot_completed", bootCompleted, "0");
             gSystemBootCompleted = strcmp(bootCompleted, "1") == 0 ? true : false;
+#else
+            gSystemBootCompleted = true;
 #endif
         }
         // retry interval in millisecond; note that vendor services stay at 100ms
diff --git a/libs/binder/include/private/binder/binder_module.h b/libs/binder/include/private/binder/binder_module.h
index 09e6ba0104..c22be9f786 100644
--- a/libs/binder/include/private/binder/binder_module.h
+++ b/libs/binder/include/private/binder/binder_module.h
@@ -24,7 +24,7 @@ namespace android {
 /* obtain structures and constants from the kernel header */
 
 // TODO(b/31559095): bionic on host
-#ifdef __ANDROID_HOST__
+#ifndef __ANDROID__
 #define __packed __attribute__((__packed__))
 #endif
 
-- 
cgit v1.2.3-59-g8ed1b