amdgpu: fix redefinition building errors

[android-x86/external-minigbm.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 0ed3586..b9fce4f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -44,7 +44,11 @@ LOCAL_CPPFLAGS += -std=c++14 -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 \
 LOCAL_CFLAGS += -Wall -Wsign-compare -Wpointer-arith \
                -Wcast-qual -Wcast-align \
                -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 \
-               -Wno-unused-value -Wno-unused-parameter
+               -Wno-unused-value -Wno-unused-parameter -Wno-typedef-redefinition
+
+LOCAL_C_INCLUDES += frameworks/native/libs/nativebase/include \
+                    frameworks/native/libs/nativewindow/include \
+                    frameworks/native/libs/arect/include \
 
 ifneq ($(filter $(intel_drivers), $(BOARD_GPU_DRIVERS)),)
 LOCAL_CPPFLAGS += -DDRV_I915
@@ -55,10 +59,11 @@ endif
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
 LOCAL_SHARED_LIBRARIES += libnativewindow
 LOCAL_STATIC_LIBRARIES += libarect
-LOCAL_HEADER_LIBRARIES += libnativebase_headers
+LOCAL_HEADER_LIBRARIES += libnativebase_headers libsystem_headers libhardware_headers libutils_headers
 LOCAL_CFLAGS += -DUSE_VNDK
 endif
 
+LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
 # The preferred path for vendor HALs is /vendor/lib/hw