fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: common: Fix link failure with standalone Android build

Browse source 
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: d5b355ce5f ("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>
This commit is contained in:
Tomasz Figa 2017-07-05 23:54:18 +09:00 • committed by Emil Velikov
parent b7ee56b599
commit 50a8a7377a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/intel/Makefile.common.am
View file

@ -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