From dab4d5a8d70ff6b90fd26df18f854698f21554f2 Mon Sep 17 00:00:00 2001 From: MoroccanMalinois Date: Sun, 24 Dec 2017 01:42:44 +0000 Subject: [PATCH] Android: use new repo path --- android/README.md | 4 ++-- android/docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/README.md b/android/README.md index b05c260a..b058230b 100644 --- a/android/README.md +++ b/android/README.md @@ -22,7 +22,7 @@ Copyright (c) 2014-2017, The Monero Project # Get the apk - docker cp monero-gui-android:/opt/android/monero-core/build/release/bin/bin/QtApp-debug.apk . + docker cp monero-gui-android:/opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk . ## Deployment @@ -31,7 +31,7 @@ Copyright (c) 2014-2017, The Monero Project First, see section [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling) The only place where we are allowed to play is `/data/local/tmp`. So : - adb push /opt/android/monero-core/build/release/bin/bin/QtApp-debug.apk /data/local/tmp + adb push /opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk /data/local/tmp adb shell pm install -r /data/local/tmp/QtApp-debug.apk - Troubleshooting: diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 43127d62..286e3baf 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -92,8 +92,8 @@ RUN cp openssl/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/li RUN cp boost_${BOOST_VERSION}/android32/lib/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib RUN cp ZBar/android/obj/local/armeabi-v7a/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib -RUN git clone https://github.com/monero-project/monero-core.git \ - && cd monero-core \ +RUN git clone https://github.com/monero-project/monero-gui.git \ + && cd monero-gui \ && git submodule update \ && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ BOOST_ROOT=/opt/android/boost_1_62_0 \ BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \