From dd5e802d338250ed9c9f2382cf67ed09a5a0f139 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Fri, 28 Oct 2016 17:54:17 +0800 Subject: 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" Fixes: 112e988329b ("Android: move libdrm settings to top-level Android.common.mk") Signed-off-by: Chih-Wei Huang Reviewed-by: Emil Velikov (cherry picked from commit e3e5b1a4884666ec806d4eb0188826578580d666) --- Android.common.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Android.common.mk') 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) \ -- cgit v1.1