diff options
| author | Tomasz Figa <[email protected]> | 2017-07-05 23:54:18 +0900 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-07-05 18:49:21 +0100 |
| commit | 50a8a7377ae071d5b4b927e9055a7ec8391acc59 (patch) | |
| tree | 82449e005da1f9ae71d8f0aa9851bcc025fb9b72 /src/intel | |
| parent | b7ee56b5991e02bf4bff4ca702182bf37e59aa07 (diff) | |
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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/Makefile.common.am | 5 |
1 files changed, 5 insertions, 0 deletions
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 |