From cd9ba8cbadf28df5d9e1354e3debeacd3517dbf7 Mon Sep 17 00:00:00 2001
From: Daniel Colascione
Date: Mon, 12 Feb 2018 11:24:47 -0800
Subject: Enable lmkd kill tracing everywhere

Test: asdf
Exempt-From-Owner-Approval: vacation
Merged-In: If6af7df74d303466aac4a69cdfe558e9748f72b9
Change-Id: If6af7df74d303466aac4a69cdfe558e9748f72b9
---
 lmkd/Android.bp | 11 +----------
 lmkd/lmkd.c     |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lmkd/Android.bp b/lmkd/Android.bp
index 2efda86cd..9ac082f54 100644
--- a/lmkd/Android.bp
+++ b/lmkd/Android.bp
@@ -7,17 +7,8 @@ cc_binary {
         "liblog",
     ],
     local_include_dirs: ["include"],
-    cflags: ["-Werror"],
-
+    cflags: ["-Werror", "-DLMKD_TRACE_KILLS"],
     init_rc: ["lmkd.rc"],
-
-    product_variables: {
-        debuggable: {
-            cflags: [
-                "-DLMKD_TRACE_KILLS"
-            ],
-        },
-    },
 }
 
 cc_library_static {
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index e7c13e0c8..1a14be3e1 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -52,8 +52,8 @@
 
 #else /* LMKD_TRACE_KILLS */
 
-#define TRACE_KILL_START(pid)
-#define TRACE_KILL_END()
+#define TRACE_KILL_START(pid) ((void)(pid))
+#define TRACE_KILL_END() ((void)0)
 
 #endif /* LMKD_TRACE_KILLS */
 
-- 
cgit v1.2.3