aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordamir <tebuchet@gmail.com>2017-12-19 17:32:49 +0300
committerdamir <tebuchet@gmail.com>2017-12-19 17:32:49 +0300
commit5388c81bbcd2a472cd1827028d4239f93f374f15 (patch)
treefed79bde8da3e334edaebcba8bb1de01dd48bf79
parentMerge pull request #2134 (diff)
downloadmonero-5388c81bbcd2a472cd1827028d4239f93f374f15.tar.xz
Added using TOOLCHAIN_DIR varable on symlinking in android dockerfiles
-rw-r--r--utils/build_scripts/android32.Dockerfile2
-rw-r--r--utils/build_scripts/android64.Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/build_scripts/android32.Dockerfile b/utils/build_scripts/android32.Dockerfile
index 37d012202..20b846aa1 100644
--- a/utils/build_scripts/android32.Dockerfile
+++ b/utils/build_scripts/android32.Dockerfile
@@ -80,7 +80,7 @@ RUN git clone https://github.com/zeromq/zeromq4-1.git \
&& CC=clang CXX=clang++ ./configure --host=arm-none-linux-gnueabi \
&& make
-RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a /opt/android/toolchain-arm/arm-linux-androideabi/lib/armv7-a
+RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a ${TOOLCHAIN_DIR}/arm-linux-androideabi/lib/armv7-a
RUN git clone https://github.com/monero-project/monero.git \
&& cd monero \
diff --git a/utils/build_scripts/android64.Dockerfile b/utils/build_scripts/android64.Dockerfile
index 70c3c2b41..83bcbad89 100644
--- a/utils/build_scripts/android64.Dockerfile
+++ b/utils/build_scripts/android64.Dockerfile
@@ -79,7 +79,7 @@ RUN git clone https://github.com/zeromq/zeromq4-1.git \
&& CC=clang CXX=clang++ ./configure --host=aarch64-linux-android \
&& make
-RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a /opt/android/toolchain-arm/aarch64-linux-android/lib
+RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a ${TOOLCHAIN_DIR}/aarch64-linux-android/lib
RUN git clone https://github.com/monero-project/monero.git \
&& cd monero \