From ea23b2679569ab443036210874ffcb83a3cdc336 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Wed, 5 Sep 2018 09:56:19 +1200 Subject: [PATCH] Removed duplicate logging for Android, and created start:android-log. --- Gruntfile.js | 4 ++-- app-template/package-template.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7aa700729..887f77c41 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -66,7 +66,7 @@ module.exports = function(grunt) { command: 'cordova prepare android && cordova build android --release', }, run_android: { - command: 'cordova run android --device && npm run log:android', + command: 'cordova run android --device', }, log_android: { command: 'adb logcat | grep chromium', @@ -363,7 +363,7 @@ module.exports = function(grunt) { grunt.registerTask('build-ios-release', ['prod', 'exec:build_ios_release']); // Build android - grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android', 'exec:log_android']); + grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']); grunt.registerTask('build-android-debug', ['exec:build_android_debug']); grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']); grunt.registerTask('sign-android', ['exec:sign_android']); diff --git a/app-template/package-template.json b/app-template/package-template.json index 691fc0a62..59430637a 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -127,6 +127,7 @@ "start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0", "start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"", "start:android": "grunt start-android", + "start:android-log": "grunt start-android && npm run log:android", "start:ios": "grunt start-ios", "start:windows": "npm run build:www && npm run build:windows",