diff options
| author | Wojciech GomoĊa <szogun1987@gmail.com> | 2018-01-28 14:52:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-28 14:52:53 +0100 |
| commit | 1ad20a1fb3705fcc57569ef71e0145a8d2277f8f (patch) | |
| tree | 1547832f1258303ee7b51bf98f6d054c9c6a5921 /android | |
| parent | 9d22b6ab4da8f310b629f989233c517eb51d301d (diff) | |
| parent | bed05a484cd54cf7269c75df2b1446638df26f7f (diff) | |
| download | monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.tar.gz monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.tar.xz monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.zip | |
Merge pull request #1 from monero-project/master
Refresh with source fork
Diffstat (limited to 'android')
| -rw-r--r-- | android/README.md | 6 | ||||
| -rw-r--r-- | android/docker/Dockerfile | 21 |
2 files changed, 13 insertions, 14 deletions
diff --git a/android/README.md b/android/README.md index b05c260a..88499336 100644 --- a/android/README.md +++ b/android/README.md @@ -1,4 +1,4 @@ -Copyright (c) 2014-2017, The Monero Project +Copyright (c) 2014-2018, The Monero Project ## Current status : ALPHA @@ -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 5f1b1e53..286e3baf 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -88,21 +88,20 @@ APP_CFLAGS += -target armv7-none-linux-androideabi -fexceptions -fstack-protect && android update project --path . -t "${ANDROID_API}" \ && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ant -Dndk.dir=${ANDROID_NDK_ROOT} -Diconv.src=${WORKDIR}/libiconv-${ICONV_VERSION} zbar-clean zbar-ndk-build -#Can't directly call build.sh because of env variables -RUN git clone https://github.com/monero-project/monero-core.git \ - && cd monero-core \ - && 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/ OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ ./get_libwallet_api.sh release-android - RUN cp openssl/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib 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 -ENV PATH $ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:${WORKDIR}/Qt-${QT_VERSION}/bin:$CLEAN_PATH - -# NB : zxcvbn-c needs to build a local binary and Qt don't care about these environnement variable -RUN cd monero-core \ - && CC="gcc" CXX="g++" ./build.sh release-android \ +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/ \ + OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ \ + CMAKE_INCLUDE_PATH=${WORKDIR}/cppzmq/ \ + CMAKE_LIBRARY_PATH=${WORKDIR}/zeromq4-1/.libs \ + CXXFLAGS="-I ${WORKDIR}/zeromq4-1/include/" \ + ./build.sh release-android \ && cd build \ && make deploy |