diff options
| author |  Jeremy Lau <lauj@google.com> | 2018-10-05 12:45:56 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-05 12:53:48 -0700 |
| commit | 3f54f1f60413cbd3e9a5a4126f8ae04bc4e06abc (patch) | |
| tree | 724b79d954301ed8ee5e5b7c0aa35abf0c050771 /tensorflow/tools | |
| parent | ef838969b95de39353a3ba495c335cbb14a0c9b5 (diff) | |
Workaround build errors in Android NDK r14b.
PiperOrigin-RevId: 215950376
Diffstat (limited to 'tensorflow/tools')
| -rw-r--r-- | tensorflow/tools/ci_build/Dockerfile.android | 5 |
1 files changed, 5 insertions, 0 deletions
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 <linux/compiler.h>" ${ANDROID_DEV_HOME}/android-ndk-r14b/platforms/android-14/arch-arm/usr/include/linux/futex.h && \ + sed -i 15i"#include <linux/compiler.h>" ${ANDROID_DEV_HOME}/android-ndk-r14b/platforms/android-14/arch-mips/usr/include/linux/futex.h && \ + sed -i 15i"#include <linux/compiler.h>" ${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}" |