diff options
| author | Stephen Hines <srhines@google.com> | 2017-11-21 17:27:07 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2017-11-21 17:27:07 -0800 |
| commit | ef7f923918952ea99af6b6f1f2c30db9baa2c224 (patch) | |
| tree | 122b57f0c02173fc497254f98ba84b6042d29b42 | |
| parent | d37101dad9f4b0c28a0f6e83e773a185b39272ce (diff) | |
| parent | cb34be54e2d08cc185dab6e3aa8bfe700545b741 (diff) | |
| download | drm_hwcomposer-ef7f923918952ea99af6b6f1f2c30db9baa2c224.tar.gz | |
resolve merge conflicts of cb34be5 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8d58046752ec975b41957b6ba81552c468c7e5f3
| -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) @@ -75,6 +86,8 @@ LOCAL_SRC_FILES := \ virtualcompositorworker.cpp \ vsyncworker.cpp +LOCAL_CFLAGS := $(common_drm_hwcomposer_cflags) + LOCAL_CPPFLAGS += \ -DHWC2_USE_CPP11 \ -DHWC2_INCLUDE_STRINGIFICATION |