Skip to contentSkip to conversation

Android: fix building of modetest and proptest

PATCH In review Rob Herring 2 participants 3 messages Mar 22, 2017 – Apr 3, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Android: fix building of modetest and proptest

These tests depend on tests/util/ headers, but expect the include path to be tests/.

---
 Android.mk            | 2 ++
 tests/util/Android.mk | 2 ++
 2 files changed, 4 insertions(+)
Android.mk +2 -0
index 5209059e670f..292be2360263 100644
@@ -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
tests/util/Android.mk +2 -0
index 7656c4c29883..12eccb42add3 100644
@@ -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)
Signature · 6 lines
2.10.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 2/2 Android: disable pointer-arith and enum-conversion

Disable some more warnings from clang. These don't appear to be warnings worth fixing.

---
 Android.common.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Android.common.mk +3 -1
index f57b8d378565..35c0f02c213c 100644
@@ -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))
Signature · 6 lines
2.10.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Re: [PATCH 2/2] Android: disable pointer-arith and enum-conversion

Quoted 3 lines · Rob Herring

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 mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel