diff options
author | Chih-Wei Huang <cwhuang@android-x86.org> | 2016-10-28 17:54:17 +0800 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-11-09 13:13:19 +0000 |
commit | dd5e802d338250ed9c9f2382cf67ed09a5a0f139 (patch) | |
tree | df7a624f6dd8ce020504b2fbc879d7f504001029 /Android.common.mk | |
parent | ea07a57fc0092ae1111df49f76f48f61a27544b9 (diff) | |
download | external_mesa3d-dd5e802d338250ed9c9f2382cf67ed09a5a0f139.zip external_mesa3d-dd5e802d338250ed9c9f2382cf67ed09a5a0f139.tar.gz external_mesa3d-dd5e802d338250ed9c9f2382cf67ed09a5a0f139.tar.bz2 |
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>
(cherry picked from commit e3e5b1a4884666ec806d4eb0188826578580d666)
Diffstat (limited to 'Android.common.mk')
-rw-r--r-- | Android.common.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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) \ |