diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-10 06:39:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-10 06:39:05 +0000 |
| commit | 2ce3de99861962c611430e4c458e8f09599a043b (patch) | |
| tree | 09cd72598c2aae6cc0ff8e72460dc1bc92835870 /gralloc | |
| parent | 4ef16822163d2270922e27c8417089dfcfac52ed (diff) | |
| parent | e3161ff12ed3f0e4a7d51036b14e67cffda56bd4 (diff) | |
| download | display-2ce3de99861962c611430e4c458e8f09599a043b.tar.gz | |
Merge "Don't put -isystem in front of $(kernel_includes)."
Diffstat (limited to 'gralloc')
| -rw-r--r-- | gralloc/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gralloc/Android.mk b/gralloc/Android.mk index b97b5df0..f2184aa5 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) LOCAL_VENDOR_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) +LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_HEADER_LIBRARIES := display_headers LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libsync libgrallocutils \ @@ -15,7 +15,6 @@ LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libsync libgralloc android.hardware.graphics.mapper@2.0 \ android.hardware.graphics.mapper@2.1 LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wall -std=c++14 -Werror -LOCAL_CFLAGS += -isystem $(kernel_includes) LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := gr_device_impl.cpp |