From e8b4ed4ca80a6a0d276631b4bfa9560f608bc4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 4 Dec 2019 16:38:11 +0100 Subject: [PATCH] fixes for RN upgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- android/app/build.gradle | 1 - .../android/maven-and-npm-deps/default.nix | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f5cf410bd6..3049fc312c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -80,7 +80,6 @@ project.ext.react = [ nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"], entryFile: "index.android.js", enableHermes: true, // clean and rebuild if changing. NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices, to guard against a hang in the UI thread after invoking status-go - hermesCommand: "../../node_modules/hermes-engine/%OS-BIN%/hermes", // Can be removed once RN moves to a version which depends on hermes-engine instead of hermesvm bundleInPr: true, inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"] ] diff --git a/nix/mobile/android/maven-and-npm-deps/default.nix b/nix/mobile/android/maven-and-npm-deps/default.nix index 313c727bb1..032756e53a 100644 --- a/nix/mobile/android/maven-and-npm-deps/default.nix +++ b/nix/mobile/android/maven-and-npm-deps/default.nix @@ -154,21 +154,7 @@ let substituteInPlace ${projectBuildDir}/node_modules/react-native/react.gradle \ --replace \ 'targetName.toLowerCase().contains("release")' \ - '!targetName.toLowerCase().contains("debug")' \ - --replace \ - 'commandLine(getHermesCommand(), "-emit-binary", "-out", jsBundleFile, jsBundleFile, *hermesFlags)' \ - 'def jsBundleFileIn = File.createTempFile("index.android",".tmp") - jsBundleFileIn.deleteOnExit() - ant.move( - file: jsBundleFile, - tofile: jsBundleFileIn - ); - commandLine(getHermesCommand(), "-emit-binary", "-out", jsBundleFile, jsBundleFileIn, *hermesFlags) - ' \ - || exit - - # Remove legacy hermesvm folder (can be removed once we upgrade RN to a version which depends on newer hermes-engine package instead of hermesvm) - rm -r ${projectBuildDir}/node_modules/hermesvm + '!targetName.toLowerCase().contains("debug")' # Patch dependencies which are not yet ported to AndroidX npx jetify