From aa78541b6fff1e72bf6e22d8a08c8586889cda73 Mon Sep 17 00:00:00 2001 From: m2049r Date: Mon, 8 Oct 2018 20:58:26 +0200 Subject: [PATCH] fix build --- external-libs/Makefile | 61 ----------------------------------- external-libs/script/clean.sh | 2 +- 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/external-libs/Makefile b/external-libs/Makefile index 8c0d280..04618e5 100644 --- a/external-libs/Makefile +++ b/external-libs/Makefile @@ -59,64 +59,3 @@ distclean: clean archive: libsodium openssl boost monero echo "Packing external-libs" tar czfv libsodium openssl boost monero external-libs.tgz - - -# dev shortcut - -# faster build for testing f-droid release -use-prebuilt-external-libs: - script/build-external-libs/use-archive.sh - -wownero-unsafe: - script/build-external-libs/fetch-wownero.sh - script/build-external-libs/patch-wownero.sh - script/build-external-libs/build-wownero.sh - - - - -fdroid_apk_path := vendor/fdroiddata/unsigned -app_id := com.wownero.wownerujo - -gradle_apk_path := app/build/outputs/apk/release -gradle_app_name := wownerujo-${gradle_app_version}_universal - - - -f-droid-sign: - zipalign -v -p 4 \ -$(fdroid_apk_path)/$(app_id)_${app_version}.apk \ -$(fdroid_apk_path)/$(app_id)_${app_version}-aligned.apk - - apksigner sign --ks ${release_key} \ ---out $(fdroid_apk_path)/$(app_id)_${app_version}-release.apk \ -$(fdroid_apk_path)/$(app_id)_${app_version}-aligned.apk - -f-droid-clean: - @rm -f $(fdroid_apk_path)/$(app_id)_${app_version}-aligned.apk - @rm -f $(fdroid_apk_path)/$(app_id)_${app_version}-release.apk - -gradle-release: gradle-build gradle-sign - -gradle-build: - ./gradlew assembleRelease - -gradle-sign: gradle-clean - zipalign -v -p 4 \ -$(gradle_apk_path)/$(gradle_app_name).apk \ -$(gradle_apk_path)/$(gradle_app_name)-aligned.apk - - apksigner sign --ks ${release_key} \ ---out $(gradle_apk_path)/$(gradle_app_name)-release.apk \ -$(gradle_apk_path)/$(gradle_app_name)-aligned.apk - -gradle-clean: - @rm -f $(gradle_apk_path)/$(gradle_app_name)-aligned.apk - @rm -f $(gradle_apk_path)/$(gradle_app_name)-release.apk - -apk-install: - adb install -r ./app/build/outputs/apk/release/wownerujo-$(gradle_app_version)_universal-release.apk - - -remove-exif: - exiftool -all= `find app/ -name '*.jp*g' -o -name '*.png'` diff --git a/external-libs/script/clean.sh b/external-libs/script/clean.sh index 4954204..aa91863 100755 --- a/external-libs/script/clean.sh +++ b/external-libs/script/clean.sh @@ -5,4 +5,4 @@ set -e source script/env.sh rm -rf $EXTERNAL_LIBS_BUILD -mkdir -p $EXTERNAL_LIBS_BUILD +mkdir -p $EXTERNAL_LIBS_BUILD/src