From 3f54f1f60413cbd3e9a5a4126f8ae04bc4e06abc Mon Sep 17 00:00:00 2001 From: Jeremy Lau Date: Fri, 5 Oct 2018 12:45:56 -0700 Subject: Workaround build errors in Android NDK r14b. PiperOrigin-RevId: 215950376 --- tensorflow/tools/ci_build/Dockerfile.android | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android index dcf077791a..7e72eb0cbf 100644 --- a/tensorflow/tools/ci_build/Dockerfile.android +++ b/tensorflow/tools/ci_build/Dockerfile.android @@ -45,9 +45,14 @@ ENV ANDROID_NDK_FILENAME android-ndk-r14b-linux-x86_64.zip ENV ANDROID_NDK_URL https://dl.google.com/android/repository/${ANDROID_NDK_FILENAME} ENV ANDROID_NDK_HOME ${ANDROID_DEV_HOME}/ndk ENV PATH ${PATH}:${ANDROID_NDK_HOME} +# Workaround for b/117156972: inject missing #include into NDK versions of +# futex.h. RUN cd ${ANDROID_DEV_HOME} && \ wget -q ${ANDROID_NDK_URL} && \ unzip ${ANDROID_NDK_FILENAME} -d ${ANDROID_DEV_HOME} && \ + sed -i 15i"#include " ${ANDROID_DEV_HOME}/android-ndk-r14b/platforms/android-14/arch-arm/usr/include/linux/futex.h && \ + sed -i 15i"#include " ${ANDROID_DEV_HOME}/android-ndk-r14b/platforms/android-14/arch-mips/usr/include/linux/futex.h && \ + sed -i 15i"#include " ${ANDROID_DEV_HOME}/android-ndk-r14b/platforms/android-14/arch-x86/usr/include/linux/futex.h && \ rm ${ANDROID_NDK_FILENAME} && \ bash -c "ln -s ${ANDROID_DEV_HOME}/android-ndk-* ${ANDROID_NDK_HOME}" -- cgit v1.2.3