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 <tfiga@chromium.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index a772b5fcd120235bc9532589f6485e438ff3c6f9..1c1c2eed304fa540261c0ada46e1b12df52941aa 100644 (file)
--- 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