Generate correct source map if hermes not enabled (facebook#25700)

HazAT · janicduplessis · commit 23a6872a6075 · 2019-07-19T12:58:05.000-04:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ afterEvaluate {`
`126`	`126`	`if (Os.isFamily(Os.FAMILY_WINDOWS)) {`
`127`	`127`	`commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",`
`128`	`128`	`"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir,`
`129`		`- "--sourcemap-output", jsPackagerSourceMapFile, *extraArgs)`
	`129`	`+ "--sourcemap-output", enableHermes ? jsPackagerSourceMapFile : jsOutputSourceMapFile, *extraArgs)`
`130`	`130`	`} else {`
`131`	`131`	`commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",`
`132`	`132`	`"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir,`
`133`		`- "--sourcemap-output", jsPackagerSourceMapFile, *extraArgs)`
	`133`	`+ "--sourcemap-output", enableHermes ? jsPackagerSourceMapFile : jsOutputSourceMapFile, *extraArgs)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`if (enableHermes) {`
`@@ -167,13 +167,6 @@ afterEvaluate {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`}`
`170`		`- } else {`
`171`		`- doLast {`
`172`		`- ant.move(`
`173`		`- file: jsPackagerSourceMapFile,`
`174`		`- tofile: jsOutputSourceMapFile`
`175`		`- );`
`176`		`- }`
`177`	`170`	`}`
`178`	`171`
`179`	`172`	`enabled config."bundleIn${targetName}" != null`