Merge commit 'e458e16debbc9068c839ce918b2e039d7efefaed' into HEAD
Change-Id: If5aaf83103dc48a2efa6c242e55e78da18bec6d2
diff --git a/msm8909/liblight/Android.mk b/msm8909/liblight/Android.mk
index e71e6f3..cb1fbf2 100644
--- a/msm8909/liblight/Android.mk
+++ b/msm8909/liblight/Android.mk
@@ -13,6 +13,7 @@
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
+include $(LOCAL_PATH)/../common.mk
# HAL module implemenation stored in
# hw/<COPYPIX_HARDWARE_MODULE_ID>.<ro.board.platform>.so
include $(CLEAR_VARS)
diff --git a/msm8994/libmemtrack/memtrack_msm.c b/msm8994/libmemtrack/memtrack_msm.c
index ab60d83..2e6adb5 100644
--- a/msm8994/libmemtrack/memtrack_msm.c
+++ b/msm8994/libmemtrack/memtrack_msm.c
@@ -16,6 +16,7 @@
#include <errno.h>
#include <stdlib.h>
+#include <string.h>
#include <utils/Log.h>
#include <hardware/memtrack.h>
diff --git a/msm8994/libqdutils/comptype.h b/msm8994/libqdutils/comptype.h
index 71f4871..53771fa 100644
--- a/msm8994/libqdutils/comptype.h
+++ b/msm8994/libqdutils/comptype.h
@@ -31,6 +31,8 @@
#define INCLUDE_LIBQCOM_COMPTYPES
#include <stdint.h>
+#include <string.h>
+
#include <utils/Singleton.h>
#include <cutils/properties.h>
diff --git a/msm8998/gpu_tonemapper/Android.mk b/msm8998/gpu_tonemapper/Android.mk
index 99facbd..fcb66cb 100644
--- a/msm8998/gpu_tonemapper/Android.mk
+++ b/msm8998/gpu_tonemapper/Android.mk
@@ -25,4 +25,6 @@
EGLImageWrapper.cpp \
Tonemapper.cpp
+LOCAL_CFLAGS += -Werror
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8998/liblight/Android.mk b/msm8998/liblight/Android.mk
index e81d64d..94bf835 100644
--- a/msm8998/liblight/Android.mk
+++ b/msm8998/liblight/Android.mk
@@ -27,4 +27,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
+LOCAL_CFLAGS += -Wall -Werror
+
include $(BUILD_SHARED_LIBRARY)
