From bc84ec42ee8c17d6431b4f45a286a89d83e25ea9 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Fri, 19 Aug 2022 02:32:02 -0700 Subject: [PATCH] Blacklist sdks/hermes from Metro resolution (#34452) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/34452 This will unblock the RN `test_android` CI Job as currently two versions of `hermes-parser` are picked up during package resolution. Changelog: [Internal] [Fixed] - Blacklist sdks/hermes from Metro resolution Reviewed By: cipolleschi Differential Revision: D38856931 fbshipit-source-id: 49d941f762ba0ef953c5c42b0ca13ac1c74b5ba5 --- metro.config.js | 2 +- packages/rn-tester/android/app/build.gradle | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/metro.config.js b/metro.config.js index 9125b65f004..190f04114a3 100644 --- a/metro.config.js +++ b/metro.config.js @@ -19,7 +19,7 @@ const getPolyfills = require('./rn-get-polyfills'); module.exports = { resolver: { // $FlowFixMe[signature-verification-failure] Can't infer RegExp type. - blockList: /buck-out/, + blockList: [/buck-out/, /sdks\/hermes/], extraNodeModules: { 'react-native': __dirname, }, diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle index 9a358595e84..198b913466c 100644 --- a/packages/rn-tester/android/app/build.gradle +++ b/packages/rn-tester/android/app/build.gradle @@ -293,4 +293,9 @@ afterEvaluate { configureCMakeDebug.dependsOn(packageReactDebugNdkLibs) preHermesDebugBuild.dependsOn(packageReactDebugNdkLibs) preJscDebugBuild.dependsOn(packageReactDebugNdkLibs) + + // As we're consuming Hermes from source, we want to make sure + // `hermesc` is built before we actually invoke the `emit*HermesResource` task + emitHermesDebugHermesResources.dependsOn(":ReactAndroid:hermes-engine:buildHermes") + emitHermesReleaseHermesResources.dependsOn(":ReactAndroid:hermes-engine:buildHermes") }