From 893a4a47e8c9290128b9254af0246e36f821c260 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Thu, 23 May 2013 09:54:13 -0700
Subject: [PATCH] adb: Only use properties on device builds

When building for the host, don't make reference to
property_get / property_set.  I'm in the process of removing
host side support for properties.

Change-Id: I691c5872b5fd538e78bc38a3fe72574cdc7f43c3
---
 adb/adb.c             | 1 +
 adb/services.c        | 1 +
 adb/sysdeps.h         | 1 -
 adb/transport_local.c | 3 +++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/adb/adb.c b/adb/adb.c
index 187f51a8d..72b7484af 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -34,6 +34,7 @@
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 #if !ADB_HOST
+#include <cutils/properties.h>
 #include <private/android_filesystem_config.h>
 #include <sys/capability.h>
 #include <linux/prctl.h>
diff --git a/adb/services.c b/adb/services.c
index d2d428a09..f0d587817 100644
--- a/adb/services.c
+++ b/adb/services.c
@@ -35,6 +35,7 @@
 #  endif
 #else
 #  include <cutils/android_reboot.h>
+#  include <cutils/properties.h>
 #endif
 
 typedef struct stinfo stinfo;
diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 0252ef3b8..4033b7220 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -261,7 +261,6 @@ extern char*  adb_strtok_r(char *str, const char *delim, char **saveptr);
 
 #include "fdevent.h"
 #include <cutils/sockets.h>
-#include <cutils/properties.h>
 #include <cutils/misc.h>
 #include <signal.h>
 #include <sys/wait.h>
diff --git a/adb/transport_local.c b/adb/transport_local.c
index 96a24ba50..1cfa24d7f 100644
--- a/adb/transport_local.c
+++ b/adb/transport_local.c
@@ -21,6 +21,9 @@
 
 #include "sysdeps.h"
 #include <sys/types.h>
+#if !ADB_HOST
+#include <cutils/properties.h>
+#endif
 
 #define  TRACE_TAG  TRACE_TRANSPORT
 #include "adb.h"