From b1f81be4bc21eb9baa39dd7ef97709d9927ad407 Mon Sep 17 00:00:00 2001
From: Daniel Griesser <daniel.griesser.86@gmail.com>
Date: Thu, 18 Jul 2019 12:54:34 +0200
Subject: [PATCH] Generate correct source map if hermes not enabled (#25700)

---
 react.gradle | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/react.gradle b/react.gradle
index 6acd02dd3910eb..1ae08ddb136648 100644
--- a/react.gradle
+++ b/react.gradle
@@ -126,11 +126,11 @@ afterEvaluate {
             if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                 commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
                     "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir,
-                    "--sourcemap-output", jsPackagerSourceMapFile, *extraArgs)
+                    "--sourcemap-output", enableHermes ? jsPackagerSourceMapFile : jsOutputSourceMapFile, *extraArgs)
             } else {
                 commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
                     "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir,
-                    "--sourcemap-output", jsPackagerSourceMapFile, *extraArgs)
+                    "--sourcemap-output", enableHermes ? jsPackagerSourceMapFile : jsOutputSourceMapFile, *extraArgs)
             }
 
             if (enableHermes) {
@@ -167,13 +167,6 @@ afterEvaluate {
                         }
                     }
                 }
-            } else {
-                doLast {
-                    ant.move(
-                        file: jsPackagerSourceMapFile,
-                        tofile: jsOutputSourceMapFile
-                    );
-                }
             }
 
             enabled config."bundleIn${targetName}" != null