These tests depend on tests/util/ headers, but expect the include path to be tests/.
Signed-off-by: Rob Herring robh@kernel.org --- Android.mk | 2 ++ tests/util/Android.mk | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/Android.mk b/Android.mk index 5209059e670f..292be2360263 100644 --- a/Android.mk +++ b/Android.mk @@ -24,6 +24,8 @@ LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
LOCAL_PATH := $(call my-dir) +LIBDRM_TOP := $(LOCAL_PATH) + include $(CLEAR_VARS)
# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES diff --git a/tests/util/Android.mk b/tests/util/Android.mk index 7656c4c29883..12eccb42add3 100644 --- a/tests/util/Android.mk +++ b/tests/util/Android.mk @@ -32,5 +32,7 @@ LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(UTIL_FILES)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LIBDRM_TOP)/tests + include $(LIBDRM_COMMON_MK) include $(BUILD_STATIC_LIBRARY)
Disable some more warnings from clang. These don't appear to be warnings worth fixing.
Signed-off-by: Rob Herring robh@kernel.org --- Android.common.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Android.common.mk b/Android.common.mk index f57b8d378565..35c0f02c213c 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -5,7 +5,9 @@ LOCAL_CFLAGS += \
LOCAL_CFLAGS += \ -Wno-unused-parameter \ - -Wno-missing-field-initializers + -Wno-missing-field-initializers \ + -Wno-pointer-arith \ + -Wno-enum-conversion
# Quiet down the build system and remove any .h files from the sources LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
On 22 March 2017 at 19:05, Rob Herring robh@kernel.org wrote:
Disable some more warnings from clang. These don't appear to be warnings worth fixing.
Maybe we should, but considering nobody has bothered in a long time let's go with this for now. R-b and pushed the series.
-Emil
dri-devel@lists.freedesktop.org