diff --git a/Makefile b/Makefile index 186cca33d..c75f80686 100644 --- a/Makefile +++ b/Makefile @@ -160,11 +160,19 @@ run-android: | check-device-android pre-run prepare-android-build ## Runs the ap @if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \ echo Starting React Native packager server; \ npm start & echo Running Android app in development; \ - npm run android; \ + if [ ! -z ${VARIANT} ]; then \ + react-native run-android --no-packager --variant=${VARIANT}; \ + else \ + react-native run-android --no-packager; \ + fi; \ wait; \ else \ echo Running Android app in development; \ - npm run android; \ + if [ ! -z ${VARIANT} ]; then \ + react-native run-android --no-packager --variant=${VARIANT}; \ + else \ + react-native run-android --no-packager; \ + fi; \ fi build: | stop pre-build check-style i18n-extract-ci ## Builds the app for Android & iOS diff --git a/package.json b/package.json index 45878152d..9cdb3d4cd 100644 --- a/package.json +++ b/package.json @@ -116,8 +116,7 @@ "test:watch": "jest --watch", "test:coverage": "jest --coverage", "updatesnapshot": "jest --updateSnapshot", - "mmjstool": "mmjstool", - "android": "cd ./android && ./gradlew app:assembleDebug && ./gradlew installDebug" + "mmjstool": "mmjstool" }, "rnpm": { "assets": [