commit cb34be54e2d08cc185dab6e3aa8bfe700545b741
author Chih-Hung Hsieh <chh@google.com> Wed Nov 22 00:06:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 22 00:06:41 2017 +0000
tree 5f4f9e3924d2edb09ef1a7850268cd25f0061d12
parent b764b4e1d88634c779a63e58883cbc326e737a09
parent eba3501283fb36721b6e750ca3cbbe6b3d683e51

resolve merge conflicts of 03e4b92 to stage-aosp-master
am: eba3501283

Change-Id: I013b9e324b4a051a7f999f616f74319b89e74bf0

Android.mk

diff --git a/Android.mk b/Android.mk
index 9d127f1..7bbe332 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,15 @@
 
 LOCAL_PATH := $(call my-dir)
 
+common_drm_hwcomposer_cflags := \
+    -Wall \
+    -Werror \
+    -Wno-unused-function \
+    -Wno-unused-label \
+    -Wno-unused-parameter \
+    -Wno-unused-private-field \
+    -Wno-unused-variable \
+
 # =====================
 # libdrmhwc_utils.a
 # =====================
@@ -24,6 +33,8 @@
 LOCAL_SRC_FILES := \
 	worker.cpp
 
+LOCAL_CFLAGS := $(common_drm_hwcomposer_cflags)
+
 LOCAL_MODULE := libdrmhwc_utils
 
 include $(BUILD_STATIC_LIBRARY)
@@ -74,6 +85,8 @@
 	virtualcompositorworker.cpp \
 	vsyncworker.cpp
 
+LOCAL_CFLAGS := $(common_drm_hwcomposer_cflags)
+
 ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),nvidia-gralloc)
 LOCAL_CPPFLAGS += -DUSE_NVIDIA_IMPORTER
 LOCAL_SRC_FILES += platformnv.cpp