projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
android: util/disk_cache: fix building errors in gallium drivers
[mesa.git] / Android.common.mk
diff --git a/Android.common.mk b/Android.common.mk
index 4d5daf8e9dd5d86cecf28df4f5f4e59d5b5b36ca..397dc03dee48c7934fb6bb69b36d3f39df6e798e 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -31,6 +31,7 @@ LOCAL_C_INCLUDES += \
 
 MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 LOCAL_CFLAGS += \
+       -Wno-error \
        -Wno-unused-parameter \
        -Wno-pointer-arith \
        -Wno-missing-field-initializers \
@@ -51,11 +52,15 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
        -DHAVE___BUILTIN_FFSLL \
+       -DHAVE_DLFCN_H \
        -DHAVE_FUNC_ATTRIBUTE_FLATTEN \
        -DHAVE_FUNC_ATTRIBUTE_UNUSED \
        -DHAVE_FUNC_ATTRIBUTE_FORMAT \
        -DHAVE_FUNC_ATTRIBUTE_PACKED \
        -DHAVE_FUNC_ATTRIBUTE_ALIAS \
+       -DHAVE_FUNC_ATTRIBUTE_NORETURN \
+       -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \
+       -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \
        -DHAVE___BUILTIN_CTZ \
        -DHAVE___BUILTIN_POPCOUNT \
        -DHAVE___BUILTIN_POPCOUNTLL \
@@ -64,9 +69,12 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_UNREACHABLE \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLADDR \
-       -DHAVE_DLOPEN \
        -DHAVE_DL_ITERATE_PHDR \
+       -DHAVE_LINUX_FUTEX_H \
+       -DHAVE_ENDIAN_H \
+       -DHAVE_ZLIB \
        -DMAJOR_IN_SYSMACROS \
+       -DVK_USE_PLATFORM_ANDROID_KHR \
        -fvisibility=hidden \
        -Wno-sign-compare
 
@@ -98,8 +106,9 @@ LOCAL_CFLAGS += -DHAVE_LIBDRM
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
 
-LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
-LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_PROPRIETARY_MODULE := true
 
 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false