diff options
| author | Nick Kralevich <nnk@google.com> | 2013-05-23 09:54:13 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-05-23 10:37:46 -0700 |
| commit | 893a4a47e8c9290128b9254af0246e36f821c260 (patch) | |
| tree | 9f5d6f4319ce325fb056c4be1197f916aebab286 /adb | |
| parent | 1c1593079433e696348195c9e3e7dc1176acc0bb (diff) | |
| download | system_core-893a4a47e8c9290128b9254af0246e36f821c260.zip system_core-893a4a47e8c9290128b9254af0246e36f821c260.tar.gz system_core-893a4a47e8c9290128b9254af0246e36f821c260.tar.bz2 | |
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
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/adb.c | 1 | ||||
| -rw-r--r-- | adb/services.c | 1 | ||||
| -rw-r--r-- | adb/sysdeps.h | 1 | ||||
| -rw-r--r-- | adb/transport_local.c | 3 |
4 files changed, 5 insertions, 1 deletions
@@ -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 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; 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 @@ 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 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" |