Merge 6ed645ba533dde0b2150992134f185983c81bd0d on remote branch
Change-Id: I0db26213c855939f41c9f95144cad052428bdd56
diff --git a/datatop/src/Android.mk b/datatop/src/Android.mk
index 9270110..f61e654 100644
--- a/datatop/src/Android.mk
+++ b/datatop/src/Android.mk
@@ -26,6 +26,7 @@
LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_CLANG := true
LOCAL_MODULE := datatop
LOCAL_MODULE_TAGS := optional
diff --git a/datatop/src/datatop.c b/datatop/src/datatop.c
index da8e74d..fba26e1 100644
--- a/datatop/src/datatop.c
+++ b/datatop/src/datatop.c
@@ -93,7 +93,7 @@
struct timeval tv, timeout;
fd_set rfds;
time_t curtime, endtime;
- int inp, quit;
+ int inp, quit = 0;
struct dtop_linked_list *curr_ptr = dpg_list;
struct dtop_data_point_gatherer *dpset;
struct timeval ftime, itime, polltime;
diff --git a/rmnetctl/src/Android.mk b/rmnetctl/src/Android.mk
index 86c70ef..9390143 100644
--- a/rmnetctl/src/Android.mk
+++ b/rmnetctl/src/Android.mk
@@ -12,7 +12,7 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-
+LOCAL_CLANG := true
LOCAL_MODULE := librmnetctl
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
diff --git a/sockev/src/Android.mk b/sockev/src/Android.mk
index fd98fc4..d0a29ee 100644
--- a/sockev/src/Android.mk
+++ b/sockev/src/Android.mk
@@ -8,6 +8,7 @@
LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_CLANG := true
LOCAL_MODULE := sockev
LOCAL_MODULE_TAGS := optional