Signed-off-by: Emil Velikov emil.l.velikov@gmail.com --- Android.mk | 1 + CleanSpec.mk | 1 + tests/modetest/Android.mk | 5 ++++- tests/util/Android.mk | 13 +++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tests/util/Android.mk
diff --git a/Android.mk b/Android.mk index 6f76113..af5f7a9 100644 --- a/Android.mk +++ b/Android.mk @@ -57,6 +57,7 @@ SUBDIRS := \ nouveau \ radeon \ libkms \ + tests/util \ tests/modetest
mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) diff --git a/CleanSpec.mk b/CleanSpec.mk index 8e23cd2..28a11db 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -1,3 +1,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/include/libdrm) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/include/freedreno) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdrm_*intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libdrm_*intermediates) diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index aee3564..6cf10dc 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -7,8 +7,11 @@ LOCAL_SRC_FILES := $(MODETEST_FILES)
LOCAL_MODULE := modetest
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm +LOCAL_C_INCLUDES += \ + $(TARGET_OUT_HEADERS)/libdrm \ + $(LIBDRM_TOP)/tests
LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_STATIC_LIBRARIES := libdrm_util
include $(BUILD_EXECUTABLE) diff --git a/tests/util/Android.mk b/tests/util/Android.mk new file mode 100644 index 0000000..4dc1cce --- /dev/null +++ b/tests/util/Android.mk @@ -0,0 +1,13 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +include $(LOCAL_PATH)/Makefile.sources + +LOCAL_SRC_FILES := $(UTIL_FILES) + +LOCAL_MODULE := libdrm_util + +LOCAL_C_INCLUDES += \ + $(TARGET_OUT_HEADERS)/libdrm + +include $(BUILD_STATIC_LIBRARY)