walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1805 from nghttp2/dockerfile-android-improvements 

Dockerfile android improvements
This commit is contained in:
Tatsuhiro Tsujikawa 2022-09-26 17:05:59 +09:00 committed by GitHub
parent 77449a9477 c06f1e9974
commit 958d9ac63b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.android
View File

@ -27,7 +27,6 @@ ENV LD $TOOLCHAIN/bin/ld
ENV RANDLIB $TOOLCHAIN/bin/llvm-ranlib ENV RANDLIB $TOOLCHAIN/bin/llvm-ranlib
ENV STRIP $TOOLCHAIN/bin/llvm-strip ENV STRIP $TOOLCHAIN/bin/llvm-strip
ENV PREFIX /root/usr/local ENV PREFIX /root/usr/local
ENV PATH $TOOLCHAIN/bin:$PATH
WORKDIR /root WORKDIR /root
RUN apt-get update && \ RUN apt-get update && \
@ -55,8 +54,8 @@ RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz &&
rm openssl-$OPENSSL_VERSION.tar.gz rm openssl-$OPENSSL_VERSION.tar.gz
WORKDIR /root/build/openssl-$OPENSSL_VERSION WORKDIR /root/build/openssl-$OPENSSL_VERSION
RUN export ANDROID_NDK_HOME=$NDK && \ RUN export ANDROID_NDK_HOME=$NDK PATH=$TOOLCHAIN/bin:$PATH && \
./Configure --prefix=$PREFIX android-arm64 && \ ./Configure no-shared --prefix=$PREFIX android-arm64 && \
make && make install_sw make && make install_sw
WORKDIR /root/build WORKDIR /root/build
@ -112,7 +111,6 @@ RUN autoreconf -i && \
--disable-shared \ --disable-shared \
--host=$TARGET \ --host=$TARGET \
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \ --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
--with-xml-prefix="$PREFIX" \
--without-libxml2 \ --without-libxml2 \
--disable-python-bindings \ --disable-python-bindings \
--disable-examples \ --disable-examples \