From e3161ff12ed3f0e4a7d51036b14e67cffda56bd4 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 9 May 2018 17:10:14 -0700 Subject: Don't put -isystem in front of $(kernel_includes). $(kernel_includes) is often empty, and isn't intended to have -isystem passed in front of it manually like this. Doing so masks the subsequent compiler argument (-fPIC) in many cases, which then causes issues further down the line. Bug: http://b/79481677 Test: Builds Change-Id: Ia335652c7f78a1b2cdf2ad0e007bd7929cd31754 --- gralloc/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gralloc') 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 -- cgit v1.2.3