commit ed3b563093f762ba5291263a03c530d3a3931bb3
author Steven Moreland <smoreland@google.com> Fri Sep 20 11:24:28 2019 -0700
committer Steven Moreland <smoreland@google.com> Fri Sep 20 13:35:17 2019 -0700
tree 900d30ba089445a52aee5ba17e4ed40e4e162a66
parent b10f1e6c6037d63aea8a98e0c52334da3d1ec51b

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/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index b6f3d7b..f3e8f45 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 @@
     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 @@
         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