diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2017-11-21 15:59:30 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2017-11-21 15:59:30 -0800 |
| commit | eba3501283fb36721b6e750ca3cbbe6b3d683e51 (patch) | |
| tree | 5f4f9e3924d2edb09ef1a7850268cd25f0061d12 | |
| parent | b764b4e1d88634c779a63e58883cbc326e737a09 (diff) | |
| parent | 03e4b928e678f224bf9e6320141b2db2ff306130 (diff) | |
| download | drm_hwcomposer-eba3501283fb36721b6e750ca3cbbe6b3d683e51.tar.gz | |
resolve merge conflicts of 03e4b92 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I72d53e4ed877dcd08504af65f24524acb9402ad8
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -16,6 +16,15 @@ ifeq ($(strip $(BOARD_USES_DRM_HWCOMPOSER)),true) 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 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ worker.cpp +LOCAL_CFLAGS := $(common_drm_hwcomposer_cflags) + LOCAL_MODULE := libdrmhwc_utils include $(BUILD_STATIC_LIBRARY) @@ -74,6 +85,8 @@ LOCAL_SRC_FILES := \ 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 |