summaryrefslogtreecommitdiff
path: root/Android.common.mk
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@android-x86.org>2016-10-28 17:54:17 +0800
committerEmil Velikov <emil.l.velikov@gmail.com>2016-11-02 14:43:26 +0000
commite3e5b1a4884666ec806d4eb0188826578580d666 (patch)
tree910d2e5f5b07a207000c13e5dcc1b6fdc3bb5b46 /Android.common.mk
parent1ef505bb02b00a577c33e1af27d983abd14465e7 (diff)
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@lists.freedesktop.org> Fixes: 112e988329b ("Android: move libdrm settings to top-level Android.common.mk") Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'Android.common.mk')
-rw-r--r--Android.common.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk
index dee22dae09..9f64c220f8 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) \