From 26a53c79bb620881e49ce43f064bd36ff11def2f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 11 Jan 2016 11:59:14 -0300 Subject: [PATCH] Fix Android beep --- Makefile | 3 --- cordova/build.sh | 19 ++++++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 11f6cef37..535b3bb5a 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ ios-debug: android-prod: cordova/build.sh ANDROID --clear - cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova build android --release jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk @@ -61,10 +60,8 @@ android-prod: android-debug: cordova/build.sh ANDROID --dbgjs --clear - cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova run android android-debug-fast: cordova/build.sh ANDROID --dbgjs - cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova run android diff --git a/cordova/build.sh b/cordova/build.sh index b2f7f9a01..330b7e5f9 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -135,20 +135,17 @@ if [ ! -d $PROJECT ]; then cordova plugin add cordova-plugin-file@3.0.0 checkOK - if [ $CURRENT_OS == "IOS" ] - then - cordova plugin add cordova-plugin-touch-id && cordova prepare - checkOK + cordova plugin add cordova-plugin-touch-id && cordova prepare + checkOK - cordova plugin add cordova-plugin-transport-security - checkOK + cordova plugin add cordova-plugin-transport-security + checkOK - cordova plugin add cordova-ios-requires-fullscreen - checkOK + cordova plugin add cordova-ios-requires-fullscreen + checkOK - cordova plugin add cordova-plugin-disable-bitcode - checkOK - fi + cordova plugin add cordova-plugin-disable-bitcode + checkOK fi