From: Henrik Austad <henrik@xxxxxxxxx> Some buildsystems use androidabe, so an exact match will break in those circumstances. Cc: John Kacur <jkacur@xxxxxxxxxx> Signed-off-by: Henrik Austad <haustad@xxxxxxxxx> --- src/arch/android/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/arch/android/Makefile b/src/arch/android/Makefile index 8e169f080adb..4249311577f4 100644 --- a/src/arch/android/Makefile +++ b/src/arch/android/Makefile @@ -1,10 +1,14 @@ -# Bionic (android) does not have: +# Android use Bionic for libc, and this does not have # - pthread barriers # - pthread_[gs]etaffinity # -# Typically see something like "aarch64-linux-android" -ifeq (android,$(ostype)) +# This is all handled by bionic.h based on flags we set here. + +# Typically see something like "aarch64-linux-android". However, in some +# buildsystems, it will be a variation of -androidabe. +ost=$(findstring android, $(ostype)) +ifeq (android,$(ost)) USE_BIONIC := 1 CFLAGS += -DNO_PTHREAD_BARRIER CFLAGS += -DNO_PTHREAD_SETAFFINITY @@ -14,9 +18,7 @@ ifeq (android,$(ostype)) LIBS := $(filter-out -lrt,$(LIBS)) LIBS := $(filter-out -lpthread,$(LIBS)) -# BIONIC does not support PI, barriers and has different files in -# include/. This means that currently, only these binaries will compile -# and link properly: +# Currently, only these binaries will compile and link properly for android # - cyclictest # - hackbench sources := cyclictest.c hackbench.c -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
