Mesa (master): android: avoid using libdrm with host modules
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Nov 2 14:57:12 UTC 2016
Module: Mesa
Branch: master
Commit: e3e5b1a4884666ec806d4eb0188826578580d666
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3e5b1a4884666ec806d4eb0188826578580d666
Author: Chih-Wei Huang <cwhuang at android-x86.org>
Date: Fri Oct 28 17:54:17 2016 +0800
android: avoid using libdrm with host modules
Note LOCAL_CFLAGS and LOCAL_SHARED_LIBRARIES in Android.common.mk
are used by both host and target modules. However, commit 112e988
moved libdrm related flags to common. It causes the errors like:
error: 'out/host/linux-x86/obj32/SHARED_LIBRARIES/libdrm_intermediates/export_includes',
needed by 'out/host/linux-x86/obj32/EXECUTABLES/mesa_gen_matypes_intermediates/import_includes',
missing and no known rule to make it
No reason to use libdrm with host modules.
Cc: "13.0" <mesa-stable at lists.freedesktop.org>
Fixes: 112e988329b ("Android: move libdrm settings to top-level
Android.common.mk")
Signed-off-by: Chih-Wei Huang <cwhuang at linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
Android.common.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Android.common.mk b/Android.common.mk
index dee22da..9f64c22 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -82,11 +82,13 @@ LOCAL_CFLAGS += \
-D__STDC_LIMIT_MACROS
endif
+ifneq ($(LOCAL_IS_HOST_MODULE),true)
# add libdrm if there are hardware drivers
ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
LOCAL_CFLAGS += -DHAVE_LIBDRM
LOCAL_SHARED_LIBRARIES += libdrm
endif
+endif
LOCAL_CPPFLAGS += \
$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
More information about the mesa-commit
mailing list