commit e54b21279f58f50da2e42a4c009e467090152aeb
author dimitry <dimitry@google.com> Mon Sep 18 16:52:45 2017 +0200
committer Dimitry Ivanov <dimitry@google.com> Wed Jan 10 15:17:05 2018 +0000
tree 065e6e39986ff0da4d6a7a7d8fd924932590879b
parent d7dd1d3af4ebac422303370301f1d98c9a84a8ae

Untie libnetd_client.so from libcutils

Identify debuggable build in bp file instead of reading
ro.debuggable property.

Test: make
Change-Id: If286c3e5490c93ad687e38631af9b11d90dd79f2

client/FwmarkClient.cpp

diff --git a/client/FwmarkClient.cpp b/client/FwmarkClient.cpp
index 31b1436..97d509d 100644
--- a/client/FwmarkClient.cpp
+++ b/client/FwmarkClient.cpp
@@ -19,7 +19,6 @@
 #include "FwmarkCommand.h"
 
 #include <errno.h>
-#include <cutils/properties.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -32,7 +31,11 @@
 
 const sockaddr_un FWMARK_SERVER_PATH = {AF_UNIX, "/dev/socket/fwmarkd"};
 
-const bool isBuildDebuggable = property_get_bool("ro.debuggable", 0) == 1;
+#if defined(NETD_CLIENT_DEBUGGABLE_BUILD)
+constexpr bool isBuildDebuggable = true;
+#else
+constexpr bool isBuildDebuggable = false;
+#endif
 
 bool isOverriddenBy(const char *name) {
     return isBuildDebuggable && getenv(name);