From: Tomasz Figa Date: Wed, 5 Jul 2017 14:54:18 +0000 (+0900) Subject: intel: common: Fix link failure with standalone Android build X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50a8a7377ae071d5b4b927e9055a7ec8391acc59;p=mesa.git intel: common: Fix link failure with standalone Android build Some reshuffle in the Makefiles under src/intel resulted in Android libraries being no longer linked with code using src/intel/common/gen_debug.h that contains references to functions exported by those libraries (namely ALOGW macro, which is currently resolved into a call to __android_log_print() from cutils). Fix the build by taking into account ANDROID_CFLAGS and ANDROID_LIBS for affected module on Android NDK builds. Fixes: d5b355ce5fd ("i965: Move intel_debug.h to intel/common/gen_debug.h") Signed-off-by: Tomasz Figa Reviewed-by: Emil Velikov --- diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am index a772b5fcd12..1c1c2eed304 100644 --- a/src/intel/Makefile.common.am +++ b/src/intel/Makefile.common.am @@ -23,3 +23,8 @@ noinst_LTLIBRARIES += common/libintel_common.la common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) common_libintel_common_la_SOURCES = $(COMMON_FILES) $(DECODER_FILES) + +if HAVE_PLATFORM_ANDROID +common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS) +common_libintel_common_la_LIBADD = $(ANDROID_LIBS) +endif