From 2bc2b43fd3d0ae505c4151c8dbda803836a7ccba Mon Sep 17 00:00:00 2001 From: Will Holen Date: Mon, 10 Feb 2020 11:04:30 -0800 Subject: [PATCH] Fix RNTester ignoring build mode and always using JSC Summary: RNTester ended up using JSC for both jscDebug and hermesDebug. Now it uses the correct one. It still includes all executors, but it's a step in the right direction. ChangeLog: [General] [Fixed] RNTester now uses the VM specified in the build flavor Reviewed By: passy Differential Revision: D19752239 fbshipit-source-id: 0db4e5201fc80c2a0b91531e3f4333148c1d9c7c --- RNTester/android/app/build.gradle | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index d27f7d9804e..a3e40069422 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -160,6 +160,11 @@ android { } } +configurations { + hermesDebugImplementation {} + hermesReleaseImplementation {} +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) @@ -169,8 +174,8 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" def hermesPath = '$projectDir/../../../../node_modules/hermes-engine/android/' - debugImplementation files(hermesPath + "hermes-debug.aar") - releaseImplementation files(hermesPath + "hermes-release.aar") + hermesDebugImplementation files(hermesPath + "hermes-debug.aar") + hermesReleaseImplementation files(hermesPath + "hermes-release.aar") debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' @@ -185,8 +190,8 @@ dependencies { } if (useIntlJsc) { - implementation 'org.webkit:android-jsc-intl:+' + jscImplementation 'org.webkit:android-jsc-intl:+' } else { - implementation 'org.webkit:android-jsc:+' + jscImplementation 'org.webkit:android-jsc:+' } }