Commit 0c4d2c3d authored by Adrien Béraud's avatar Adrien Béraud

build: update ndk

Change-Id: I40122c8d2bffcf5eb3894ed4173d1925fdaa0758
parent eeed903c
......@@ -88,13 +88,13 @@ cd $JNIDIR
PACKAGEDIR=$ANDROID_APP_DIR/libringclient/src/main/java/cx/ring/daemon $JNIDIR/make-swig.sh
# Setup cross-compilation build environemnt
export AR=$TOOLCHAIN/bin/$TARGET-ar
export AR=$TOOLCHAIN/bin/llvm-ar
export AS=$TOOLCHAIN/bin/$TARGET-as
export CC=$TOOLCHAIN/bin/$TARGET_CC$API-clang
export CXX=$TOOLCHAIN/bin/$TARGET_CC$API-clang++
export LD=$TOOLCHAIN/bin/$TARGET-ld
export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
export STRIP=$TOOLCHAIN/bin/$TARGET-strip
export LD=$TOOLCHAIN/bin/ld
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
export STRIP=$TOOLCHAIN/bin/llvm-strip
FLAGS_COMMON="-fPIC -g"
EXTRA_CFLAGS="${EXTRA_CFLAGS} ${FLAGS_COMMON}"
......@@ -199,6 +199,7 @@ ${CXX} --shared \
-Wno-unused-variable \
-Wno-unused-function \
-Wno-unused-parameter \
-Wl,-Bsymbolic \
${JNIDIR}/ring_wrapper.cpp \
${DAEMON_BUILD_DIR}/src/.libs/libring.a \
-isystem ${DAEMON_DIR}/contrib/${TARGET}/include \
......
......@@ -57,13 +57,13 @@ RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.1.tar.
# Android SDK libraries, NDK
RUN sdkmanager --sdk_root=${ANDROID_HOME} --update
RUN (while sleep 1; do echo "y"; done) | sdkmanager --sdk_root=${ANDROID_HOME} 'build-tools;30.0.3' \
RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${ANDROID_HOME} 'build-tools;30.0.3' \
'platforms;android-30'\
'extras;android;m2repository'\
'extras;google;m2repository'\
'ndk;21.3.6528147'
'ndk;23.0.7272597'
ENV ANDROID_SDK=${ANDROID_HOME}
ENV ANDROID_NDK=${ANDROID_HOME}/ndk/21.3.6528147
ENV ANDROID_NDK=${ANDROID_HOME}/ndk/23.0.7272597
# Fastlane
RUN gem install fastlane -NV
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment