commit cf41bbf3116a3a349e5bd9155214e003f11a10b2
author Nick Kralevich <nnk@google.com> Fri May 24 21:36:04 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 24 21:36:04 2013 +0000
tree 1d3198f7f4499c9edbef7a3ec1b621741336fbd0
parent d8b11c1ddd071e91f2ff8121be4f91e84cb9729a
parent 893a4a47e8c9290128b9254af0246e36f821c260

Merge "adb: Only use properties on device builds"

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 187f51a..72b7484 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>

adb/services.c

diff --git a/adb/services.c b/adb/services.c
index d2d428a..f0d5878 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;

adb/sysdeps.h

diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 0252ef3..4033b72 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -261,7 +261,6 @@
 
 #include "fdevent.h"
 #include <cutils/sockets.h>
-#include <cutils/properties.h>
 #include <cutils/misc.h>
 #include <signal.h>
 #include <sys/wait.h>

adb/transport_local.c

diff --git a/adb/transport_local.c b/adb/transport_local.c
index 96a24ba..1cfa24d 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"