diff --git a/Makefile b/Makefile index b17876bb86..99257bbab3 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ repl-android: ##@repl Start REPL for Android # Run # ------------- run-android: ##@run Run Android build + cd android; ./gradlew react-native-android:installArchives react-native run-android --appIdSuffix debug SIMULATOR= diff --git a/android/app/build.gradle b/android/app/build.gradle index 9eb2f2b02b..1ed5559dba 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -248,7 +248,7 @@ task hemroidBuild(type: Exec) { def rootDir = project.rootDir def localProperties = new File(rootDir, "local.properties") - def ndkDir = "$System.env.ANDROID_NDK_HOME" + def ndkDir = "$System.env.ANDROID_NDK" if (localProperties.exists()) { Properties properties = new Properties() localProperties.withInputStream { instr -> diff --git a/scripts/run-osx b/scripts/run-osx index 9ac7c2847f..463e936eb2 100755 --- a/scripts/run-osx +++ b/scripts/run-osx @@ -76,7 +76,7 @@ sleep 10s adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449 -react-native run-android +make run-android if [ ! -z $3 ] then