Snap for 4613997 from c02c42fca8b227edf3306690e779673615bc49b1 to pi-release

Change-Id: Ie6ba1b4edb3f2cb0ead5cbc86b77528822d14e5c
2018-02-21 08:21:46 +00:00 · 2018-02-21 08:21:46 +00:00 · 98be30f03a
parent e30b013acd 56b95d787f
commit 98be30f03a
2 changed files with 3 additions and 12 deletions
--- a/Android.bp
+++ b/Android.bp
@ -10,17 +10,8 @@ cc_binary {
        "libstatslogc",
    ],
    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 {
--- a/lmkd.c
+++ b/lmkd.c
@ -55,8 +55,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 */