Merge "Use -Werror in hardware/qcom/display"
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/msm8998/gpu_tonemapper/Android.mk b/msm8998/gpu_tonemapper/Android.mk
index 45e0915..a5b5a8e 100644
--- a/msm8998/gpu_tonemapper/Android.mk
+++ b/msm8998/gpu_tonemapper/Android.mk
@@ -24,4 +24,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 32d6a7b..eec6bb8 100644
--- a/msm8998/liblight/Android.mk
+++ b/msm8998/liblight/Android.mk
@@ -26,4 +26,6 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_VENDOR_MODULE := true
 
+LOCAL_CFLAGS += -Wall -Werror
+
 include $(BUILD_SHARED_LIBRARY)