diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2016-08-23 14:35:21 +0800 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2016-11-01 20:42:00 +0100 |
| commit | 762be8a98d86d4b618f88d758528d7da567a32f6 (patch) | |
| tree | 6d82792a8a7fd0748472ca80fdb9ab5cd64e4353 /Android.common.mk | |
| parent | 02b3f89340f37a5d51ace8a16468a4e7b7572bf4 (diff) | |
| download | external_mesa3d-762be8a98d86d4b618f88d758528d7da567a32f6.zip external_mesa3d-762be8a98d86d4b618f88d758528d7da567a32f6.tar.gz external_mesa3d-762be8a98d86d4b618f88d758528d7da567a32f6.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.
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
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 26d2482..e9ad8ac 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -99,11 +99,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)),-std=c++11) \ |