2019-10-16 20:03:47 +03:00
|
|
|
/*
|
2021-12-31 02:08:43 +03:00
|
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
2019-10-16 20:03:47 +03:00
|
|
|
*
|
|
|
|
* This source code is licensed under the MIT license found in the
|
|
|
|
* LICENSE file in the root directory of this source tree.
|
|
|
|
*/
|
2018-09-07 23:08:05 +03:00
|
|
|
|
2015-11-18 23:17:39 +03:00
|
|
|
import org.apache.tools.ant.taskdefs.condition.Os
|
2022-02-09 21:22:23 +03:00
|
|
|
import org.gradle.internal.jvm.Jvm
|
2015-11-18 23:17:39 +03:00
|
|
|
|
Fix error with bundling task eval. when no gradle config is provided (#27101)
Summary:
Fix `react.gradle`'s handling of the case where a configuration isn't explicitly specified by the parent project - e.g. before importing to `build.gradle` files:
```groovy
apply plugin: 'com.android.application'
// Nothing to define:
// project.ext.react = [
// ]
apply from: "../../node_modules/react-native/react.gradle"
```
This is a _ridiculously_ subtle change but it is nevertheless important, as, combined with other groovy quirks, it can result in an overall misbehaviour of the build script.
### Source of the bug
Currently, when a react build config _isn't_ specified by the user, RN's `react.gradle` falls back to `[]` (i.e. in [this line](https://github.com/facebook/react-native/blob/81a6b6ed3c54498f6f2148c106846352405949bf/react.gradle#L8)). In groovy, `[]` stands for an empty _array_ (actually, an empty `ArrayList` instance). The config, however, is expected to have the nature of a `Map`.
### Effects of the bug
As a bottom line, whenever a configuration isn't specified, the evaluation of [the condition](https://github.com/facebook/react-native/blob/81a6b6ed3c54498f6f2148c106846352405949bf/react.gradle#L184) as to whether the bundling task in question should be enabled, results in the following build-time exception:
```
FAILURE: Build failed with an exception.
* Where:
Script '/Users/...../node_modules/react-native/react.gradle' line: 179
* What went wrong:
A problem occurred configuring project ':app'.
> Could not create task ':app:bundleDebugJsAndAssets'.
> Could not find method enabled() for arguments [[]] on task ':app:bundleDebugJsAndAssets' of type org.gradle.api.tasks.Exec.
* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.
* Get more help at https://help.gradle.org
BUILD FAILED in 9s
```
I'm not much of a Groovy person, but while digging in, I've learned that it has the following odd attribute to it:
When accessing a non-existing property of an empty `ArrayList` in a bean-like fashion (i.e. as `array.property1` rather than `array.getProperty('property1')`), a new empty array is returned. This only holds true for _empty_ arrays, as illustrated by the following snippet:
```groovy
def emptyArr = []
def arr = [40, 2]
def result1 = (emptyArr.uninitializedProp == null)
println "$result1, ${emptyArr.uninitializedProp}" // ==> false, []"
def result2 = (arr.uninitializedProp == null) // ==> MissingPropertyException
println result2 // Never reached
```
While this whole scheme could be a bug, it's nonetheless effective in both the latest 2.x.x groovy version and in 2.1.0 (which is the oldest one that seems to be available for download nowadays). The point being is that its a behavior that's sticked.
Note that other evaluations of `config` properties (e.g. [lines 10-19](https://github.com/facebook/react-native/blob/81a6b6ed3c54498f6f2148c106846352405949bf/react.gradle#L10)) in the script are not effected by this as they are initially only examined in a boolean form, rather than using a null comparison; "Lucky" for us, empty arrays evaluate to `false`.
### Fix
Simply fallback to a groovy map rather than an array whenever `config` hasn't been specified. Namely, initialize it to `[:]`, which results in a new `HashMap` instance, rather than `[]`.
### Workaround
Until effectively fixed, can be worked-around by explicitly setting config to an empty map before the react gradle script is imported by the user:
```groovy
apply plugin: 'com.android.application'
project.ext.react = [:]
apply from: "../../node_modules/react-native/react.gradle"
```
## Changelog
[Android] [Fixed] - Fix 'Could not create task ':app:bundleDebugJsAndAssets'.' error in project with no react config
Pull Request resolved: https://github.com/facebook/react-native/pull/27101
Test Plan: Mostly regression is required here. I've myself ran this over a project with an empty config and the app has launched successfully in both `release` and `debug` flavors.
Differential Revision: D18298542
Pulled By: cpojer
fbshipit-source-id: 88b4715b75f190003c4813e5324a5094a7779f67
2019-11-04 19:13:32 +03:00
|
|
|
def config = project.hasProperty("react") ? project.react : [:];
|
2015-10-19 16:32:02 +03:00
|
|
|
|
2019-10-14 09:39:29 +03:00
|
|
|
def detectEntryFile(config) {
|
|
|
|
if (System.getenv('ENTRY_FILE')) {
|
|
|
|
return System.getenv('ENTRY_FILE')
|
|
|
|
} else if (config.entryFile) {
|
|
|
|
return config.entryFile
|
|
|
|
} else if ((new File("${projectDir}/../../index.android.js")).exists()) {
|
|
|
|
return "index.android.js"
|
|
|
|
}
|
|
|
|
|
|
|
|
return "index.js";
|
|
|
|
}
|
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"
|
2015-10-19 16:32:02 +03:00
|
|
|
def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
|
2019-10-14 09:39:29 +03:00
|
|
|
def entryFile = detectEntryFile(config)
|
2017-10-14 03:22:00 +03:00
|
|
|
def bundleCommand = config.bundleCommand ?: "bundle"
|
2018-08-04 02:55:37 +03:00
|
|
|
def reactRoot = file(config.root ?: "../../")
|
2015-10-19 16:32:02 +03:00
|
|
|
def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
|
2017-10-14 03:22:00 +03:00
|
|
|
def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
|
2019-07-26 08:59:00 +03:00
|
|
|
def enableVmCleanup = config.enableVmCleanup == null ? true : config.enableVmCleanup
|
2022-04-21 17:19:28 +03:00
|
|
|
def hermesCommand = config.hermesCommand
|
2015-10-19 16:32:02 +03:00
|
|
|
|
2022-03-15 19:24:22 +03:00
|
|
|
/**
|
|
|
|
* Detects CLI location in a similar fashion to the React Native CLI
|
|
|
|
*/
|
|
|
|
def detectCliPath(config, reactRoot) {
|
|
|
|
// 1. preconfigured path
|
|
|
|
if (config.cliPath) {
|
|
|
|
def cliJsAbsolute = new File(config.cliPath)
|
|
|
|
if (cliJsAbsolute.exists()) {
|
|
|
|
return cliJsAbsolute.getAbsolutePath()
|
|
|
|
}
|
|
|
|
def cliJsRelativeToRoot = new File("${rootDir}/${config.cliPath}")
|
|
|
|
if (cliJsRelativeToRoot.exists()) {
|
|
|
|
return cliJsRelativeToRoot.getAbsolutePath()
|
|
|
|
}
|
|
|
|
def cliJsRelativeToProject = new File("${projectDir}/${config.cliPath}")
|
|
|
|
if (cliJsRelativeToProject.exists()) {
|
|
|
|
return cliJsRelativeToProject.getAbsolutePath()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 2. node module path
|
|
|
|
def cliJsFromNode = new File(["node", "--print", "require.resolve('react-native/cli').bin"].execute(null, rootDir).text.trim())
|
|
|
|
if (cliJsFromNode.exists()) {
|
|
|
|
return cliJsFromNode.getAbsolutePath()
|
|
|
|
}
|
|
|
|
|
|
|
|
// 3. cli.js in the root folder
|
|
|
|
def rootCliJs = new File(reactRoot, "node_modules/react-native/cli.js")
|
|
|
|
if (rootCliJs.exists()) {
|
|
|
|
return rootCliJs.getAbsolutePath()
|
|
|
|
}
|
|
|
|
|
|
|
|
throw new Exception("Couldn't determine CLI location. " +
|
|
|
|
"Please set `project.ext.react.cliPath` to the path of the react-native cli.js file. " +
|
|
|
|
"This file typically resides in `node_modules/react-native/cli.js`");
|
|
|
|
}
|
|
|
|
|
2019-06-05 16:09:09 +03:00
|
|
|
def reactNativeDevServerPort() {
|
|
|
|
def value = project.getProperties().get("reactNativeDevServerPort")
|
|
|
|
return value != null ? value : "8081"
|
|
|
|
}
|
|
|
|
|
|
|
|
def reactNativeInspectorProxyPort() {
|
|
|
|
def value = project.getProperties().get("reactNativeInspectorProxyPort")
|
|
|
|
return value != null ? value : reactNativeDevServerPort()
|
|
|
|
}
|
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
def getHermesOSBin() {
|
2019-08-12 12:42:00 +03:00
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) return "win64-bin";
|
|
|
|
if (Os.isFamily(Os.FAMILY_MAC)) return "osx-bin";
|
|
|
|
if (Os.isOs(null, "linux", "amd64", null)) return "linux64-bin";
|
|
|
|
throw new Exception("OS not recognized. Please set project.ext.react.hermesCommand " +
|
|
|
|
"to the path of a working Hermes compiler.");
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure not to inspect the Hermes config unless we need it,
|
|
|
|
// to avoid breaking any JSC-only setups.
|
|
|
|
def getHermesCommand = {
|
2022-04-21 17:19:28 +03:00
|
|
|
// 1. If the project specifies a Hermes command, don't second guess it.
|
|
|
|
if (config.hermesCommand?.trim()) {
|
|
|
|
if (hermesCommand.contains("%OS-BIN%")) {
|
|
|
|
return hermesCommand
|
|
|
|
.replaceAll("%OS-BIN%", getHermesOSBin())
|
|
|
|
.replace('/' as char, File.separatorChar)
|
|
|
|
} else {
|
|
|
|
return hermesCommand
|
|
|
|
.replace('/' as char, File.separatorChar)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 2. If the project is building hermes-engine from source, use hermesc from there
|
2022-04-25 22:15:41 +03:00
|
|
|
// Also note that user can override the hermes source location with
|
|
|
|
// the `REACT_NATIVE_OVERRIDE_HERMES_DIR` env variable.
|
|
|
|
def hermesOverrideDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR")
|
2022-04-27 19:41:11 +03:00
|
|
|
def builtHermesc = hermesOverrideDir ?
|
|
|
|
new File(hermesOverrideDir, "build/bin/hermesc") :
|
|
|
|
new File(reactRoot, "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc")
|
|
|
|
|
2022-04-21 17:19:28 +03:00
|
|
|
if (builtHermesc.exists()) {
|
|
|
|
return builtHermesc.getAbsolutePath()
|
|
|
|
}
|
|
|
|
|
|
|
|
// 3. If the react-native contains a pre-built hermesc, use it.
|
|
|
|
def prebuiltHermesPath = "node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
|
|
|
|
.replaceAll("%OS-BIN%", getHermesOSBin())
|
|
|
|
.replace('/' as char, File.separatorChar);
|
|
|
|
def prebuiltHermes = new File(reactRoot, prebuiltHermesPath)
|
|
|
|
if (prebuiltHermes.exists()) {
|
|
|
|
return prebuiltHermes.getAbsolutePath()
|
2019-08-12 12:42:00 +03:00
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
|
2022-04-21 17:19:28 +03:00
|
|
|
throw new Exception("Couldn't determine Hermesc location. " +
|
|
|
|
"Please set `project.ext.react.hermesCommand` to the path of the hermesc binary file. " +
|
|
|
|
"node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc");
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set enableHermesForVariant to a function to configure per variant,
|
|
|
|
// or set `enableHermes` to True/False to set all of them
|
|
|
|
def enableHermesForVariant = config.enableHermesForVariant ?: {
|
2019-08-12 12:42:00 +03:00
|
|
|
def variant -> config.enableHermes ?: false
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
|
2021-10-13 22:49:02 +03:00
|
|
|
// Set hermesFlagsForVariant to a function to configure per variant,
|
|
|
|
// or set `hermesFlagsRelease` and `hermesFlagsDebug` to an array
|
|
|
|
def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
|
|
|
|
def variant ->
|
|
|
|
def hermesFlags;
|
|
|
|
if (variant.name.toLowerCase().contains("release")) {
|
|
|
|
// Can't use ?: since that will also substitute valid empty lists
|
|
|
|
hermesFlags = config.hermesFlagsRelease
|
|
|
|
if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
|
|
|
|
} else {
|
|
|
|
hermesFlags = config.hermesFlagsDebug
|
|
|
|
if (hermesFlags == null) hermesFlags = []
|
|
|
|
}
|
|
|
|
return hermesFlags
|
|
|
|
}
|
|
|
|
|
Fix devDisabledInStaging not working with multiple productFlavors (#30606)
Summary:
Fixes https://github.com/facebook/react-native/issues/27052
Since react-native 0.62, the `devDisabledIn${buildType}` syntax has stopped working for apps with multiple `productFlavors`. This PR adds the `disableDevForVariant` lambda to allow dev mode to be disabled for different variants.
## Changelog
<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->
[Android] [Fixed] - Fix devDisabledIn not working with multiple productFlavors
Pull Request resolved: https://github.com/facebook/react-native/pull/30606
Test Plan:
I added the following log into `react.gradle` and ran the Android build for my app:
```
println("devEnabled: ${targetName}, ${devEnabled}")
```
```
# build.gradle
project.ext.react = [
entryFile: "index.android.js",
enableHermes: true, // clean and rebuild if changing
bundleInLive: true,
disableDevForVariant: {
def variant -> variant.name.toLowerCase().contains('release') || variant.name.toLowerCase().contains('live')
},
]
...
flavorDimensions 'branding'
productFlavors {
cve {
dimension 'branding'
}
whce {
dimension 'branding'
}
}
```
Console output:
```
Reading env from: env/cve/live
devEnabled: CveDebug, true
devEnabled: CveRelease, false
devEnabled: CveLive, false
devEnabled: WhceDebug, true
devEnabled: WhceRelease, false
devEnabled: WhceLive, false
```
Reviewed By: cortinico
Differential Revision: D31649977
Pulled By: ShikaSD
fbshipit-source-id: 520734314f4bca7608b8dca67c7c5ce0be6d31a5
2021-10-25 18:10:23 +03:00
|
|
|
// Set disableDevForVariant to a function to configure per variant,
|
|
|
|
// defaults to `devDisabledIn${targetName}` or True for Release variants and False for debug variants
|
|
|
|
def disableDevForVariant = config.disableDevForVariant ?: {
|
Add bundleForVariant option (#32472)
Summary:
Ref https://github.com/facebook/react-native/pull/30606#issuecomment-948458552
## Changelog
[Android] [Added] - Add bundleForVariant option
Pull Request resolved: https://github.com/facebook/react-native/pull/32472
Test Plan:
I added the following log into react.gradle and ran the Android build for my app:
```
println("bundleEnabled: ${targetName}, ${bundleForVariant(variant)}")
```
```
# build.gradle
project.ext.react = [
entryFile: "index.android.js",
enableHermes: true, // clean and rebuild if changing
bundleForVariant: {
def variant -> variant.name.toLowerCase().contains('release') || variant.name.toLowerCase().contains('live')
},
]
...
flavorDimensions 'branding'
productFlavors {
cve {
dimension 'branding'
}
whce {
dimension 'branding'
}
}
```
Console output:
```
Reading env from: env/cve/live
bundleEnabled: CveDebug, false
bundleEnabled: CveRelease, true
bundleEnabled: CveLive, true
bundleEnabled: WhceDebug, false
bundleEnabled: WhceRelease, true
bundleEnabled: WhceLive, true
```
Reviewed By: cortinico, ryancat
Differential Revision: D31910406
Pulled By: ShikaSD
fbshipit-source-id: baca5efaddedddad15d974cc7bb8f3c2a4c4f35b
2021-10-26 14:57:44 +03:00
|
|
|
def variant ->
|
|
|
|
config."devDisabledIn${variant.name.capitalize()}" ||
|
|
|
|
variant.name.toLowerCase().contains("release")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set bundleForVariant to a function to configure per variant,
|
|
|
|
// defaults to `bundleIn${targetName}` or True for Release variants and False for debug variants
|
|
|
|
def bundleForVariant = config.bundleForVariant ?: {
|
|
|
|
def variant ->
|
|
|
|
config."bundleIn${variant.name.capitalize()}" ||
|
|
|
|
config."bundleIn${variant.buildType.name.capitalize()}" ||
|
|
|
|
variant.name.toLowerCase().contains("release")
|
Fix devDisabledInStaging not working with multiple productFlavors (#30606)
Summary:
Fixes https://github.com/facebook/react-native/issues/27052
Since react-native 0.62, the `devDisabledIn${buildType}` syntax has stopped working for apps with multiple `productFlavors`. This PR adds the `disableDevForVariant` lambda to allow dev mode to be disabled for different variants.
## Changelog
<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->
[Android] [Fixed] - Fix devDisabledIn not working with multiple productFlavors
Pull Request resolved: https://github.com/facebook/react-native/pull/30606
Test Plan:
I added the following log into `react.gradle` and ran the Android build for my app:
```
println("devEnabled: ${targetName}, ${devEnabled}")
```
```
# build.gradle
project.ext.react = [
entryFile: "index.android.js",
enableHermes: true, // clean and rebuild if changing
bundleInLive: true,
disableDevForVariant: {
def variant -> variant.name.toLowerCase().contains('release') || variant.name.toLowerCase().contains('live')
},
]
...
flavorDimensions 'branding'
productFlavors {
cve {
dimension 'branding'
}
whce {
dimension 'branding'
}
}
```
Console output:
```
Reading env from: env/cve/live
devEnabled: CveDebug, true
devEnabled: CveRelease, false
devEnabled: CveLive, false
devEnabled: WhceDebug, true
devEnabled: WhceRelease, false
devEnabled: WhceLive, false
```
Reviewed By: cortinico
Differential Revision: D31649977
Pulled By: ShikaSD
fbshipit-source-id: 520734314f4bca7608b8dca67c7c5ce0be6d31a5
2021-10-25 18:10:23 +03:00
|
|
|
}
|
|
|
|
|
2021-10-13 22:49:02 +03:00
|
|
|
// Set deleteDebugFilesForVariant to a function to configure per variant,
|
|
|
|
// defaults to True for Release variants and False for debug variants
|
|
|
|
def deleteDebugFilesForVariant = config.deleteDebugFilesForVariant ?: {
|
|
|
|
def variant -> variant.name.toLowerCase().contains("release")
|
|
|
|
}
|
|
|
|
|
2019-06-05 16:09:09 +03:00
|
|
|
android {
|
|
|
|
buildTypes.all {
|
|
|
|
resValue "integer", "react_native_dev_server_port", reactNativeDevServerPort()
|
|
|
|
resValue "integer", "react_native_inspector_proxy_port", reactNativeInspectorProxyPort()
|
|
|
|
}
|
|
|
|
}
|
2016-01-07 20:32:46 +03:00
|
|
|
|
2022-02-09 21:22:23 +03:00
|
|
|
def jvmVersion = Jvm.current().javaVersion.majorVersion
|
|
|
|
if (jvmVersion.toInteger() <= 8) {
|
|
|
|
println "\n\n\n"
|
|
|
|
println "**************************************************************************************************************"
|
|
|
|
println "\n\n"
|
|
|
|
println "ERROR: requires JDK11 or higher."
|
|
|
|
println "Incompatible major version detected: '" + jvmVersion + "'"
|
|
|
|
println "\n\n"
|
|
|
|
println "**************************************************************************************************************"
|
|
|
|
println "\n\n\n"
|
|
|
|
System.exit(1)
|
|
|
|
}
|
|
|
|
|
2018-03-26 08:00:11 +03:00
|
|
|
afterEvaluate {
|
2018-12-07 07:30:24 +03:00
|
|
|
def isAndroidLibrary = plugins.hasPlugin("com.android.library")
|
|
|
|
def variants = isAndroidLibrary ? android.libraryVariants : android.applicationVariants
|
|
|
|
variants.all { def variant ->
|
2018-08-04 02:55:37 +03:00
|
|
|
// Create variant and target names
|
|
|
|
def targetName = variant.name.capitalize()
|
|
|
|
def targetPath = variant.dirName
|
|
|
|
|
|
|
|
// React js bundle directories
|
|
|
|
def jsBundleDir = file("$buildDir/generated/assets/react/${targetPath}")
|
|
|
|
def resourcesDir = file("$buildDir/generated/res/react/${targetPath}")
|
|
|
|
|
|
|
|
def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
|
2019-07-26 08:59:00 +03:00
|
|
|
def jsSourceMapsDir = file("$buildDir/generated/sourcemaps/react/${targetPath}")
|
|
|
|
def jsIntermediateSourceMapsDir = file("$buildDir/intermediates/sourcemaps/react/${targetPath}")
|
|
|
|
def jsPackagerSourceMapFile = file("$jsIntermediateSourceMapsDir/${bundleAssetName}.packager.map")
|
|
|
|
def jsCompilerSourceMapFile = file("$jsIntermediateSourceMapsDir/${bundleAssetName}.compiler.map")
|
|
|
|
def jsOutputSourceMapFile = file("$jsSourceMapsDir/${bundleAssetName}.map")
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// Additional node and packager commandline arguments
|
|
|
|
def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
|
2022-03-15 19:24:22 +03:00
|
|
|
def cliPath = detectCliPath(config, reactRoot)
|
2019-11-05 14:03:04 +03:00
|
|
|
|
|
|
|
def execCommand = []
|
|
|
|
|
2020-04-15 21:16:12 +03:00
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
execCommand.addAll(["cmd", "/c", *nodeExecutableAndArgs, cliPath])
|
2019-11-05 14:03:04 +03:00
|
|
|
} else {
|
2020-04-15 21:16:12 +03:00
|
|
|
execCommand.addAll([*nodeExecutableAndArgs, cliPath])
|
2019-11-05 14:03:04 +03:00
|
|
|
}
|
2020-08-01 04:47:45 +03:00
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
def enableHermes = enableHermesForVariant(variant)
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
def currentBundleTask = tasks.create(
|
|
|
|
name: "bundle${targetName}JsAndAssets",
|
|
|
|
type: Exec) {
|
|
|
|
group = "react"
|
|
|
|
description = "bundle JS and assets for ${targetName}."
|
|
|
|
|
|
|
|
// Create dirs if they are not there (e.g. the "clean" task just ran)
|
|
|
|
doFirst {
|
|
|
|
jsBundleDir.deleteDir()
|
|
|
|
jsBundleDir.mkdirs()
|
|
|
|
resourcesDir.deleteDir()
|
|
|
|
resourcesDir.mkdirs()
|
2019-07-26 08:59:00 +03:00
|
|
|
jsIntermediateSourceMapsDir.deleteDir()
|
|
|
|
jsIntermediateSourceMapsDir.mkdirs()
|
|
|
|
jsSourceMapsDir.deleteDir()
|
|
|
|
jsSourceMapsDir.mkdirs()
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set up inputs and outputs so gradle can cache the result
|
|
|
|
inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
|
2019-02-09 21:14:55 +03:00
|
|
|
outputs.dir(jsBundleDir)
|
|
|
|
outputs.dir(resourcesDir)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// Set up the call to the react-native cli
|
2019-02-09 21:14:55 +03:00
|
|
|
workingDir(reactRoot)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// Set up dev mode
|
Fix devDisabledInStaging not working with multiple productFlavors (#30606)
Summary:
Fixes https://github.com/facebook/react-native/issues/27052
Since react-native 0.62, the `devDisabledIn${buildType}` syntax has stopped working for apps with multiple `productFlavors`. This PR adds the `disableDevForVariant` lambda to allow dev mode to be disabled for different variants.
## Changelog
<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->
[Android] [Fixed] - Fix devDisabledIn not working with multiple productFlavors
Pull Request resolved: https://github.com/facebook/react-native/pull/30606
Test Plan:
I added the following log into `react.gradle` and ran the Android build for my app:
```
println("devEnabled: ${targetName}, ${devEnabled}")
```
```
# build.gradle
project.ext.react = [
entryFile: "index.android.js",
enableHermes: true, // clean and rebuild if changing
bundleInLive: true,
disableDevForVariant: {
def variant -> variant.name.toLowerCase().contains('release') || variant.name.toLowerCase().contains('live')
},
]
...
flavorDimensions 'branding'
productFlavors {
cve {
dimension 'branding'
}
whce {
dimension 'branding'
}
}
```
Console output:
```
Reading env from: env/cve/live
devEnabled: CveDebug, true
devEnabled: CveRelease, false
devEnabled: CveLive, false
devEnabled: WhceDebug, true
devEnabled: WhceRelease, false
devEnabled: WhceLive, false
```
Reviewed By: cortinico
Differential Revision: D31649977
Pulled By: ShikaSD
fbshipit-source-id: 520734314f4bca7608b8dca67c7c5ce0be6d31a5
2021-10-25 18:10:23 +03:00
|
|
|
def devEnabled = !disableDevForVariant(variant)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2020-12-02 04:15:07 +03:00
|
|
|
def extraArgs = []
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
if (bundleConfig) {
|
2020-12-02 04:15:07 +03:00
|
|
|
extraArgs.add("--config")
|
|
|
|
extraArgs.add(bundleConfig)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Hermes doesn't require JS minification.
|
|
|
|
if (enableHermes && !devEnabled) {
|
|
|
|
extraArgs.add("--minify")
|
|
|
|
extraArgs.add("false")
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config.extraPackagerArgs) {
|
|
|
|
extraArgs.addAll(config.extraPackagerArgs)
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
2019-11-05 14:03:04 +03:00
|
|
|
commandLine(*execCommand, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
|
|
|
|
"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir,
|
|
|
|
"--sourcemap-output", enableHermes ? jsPackagerSourceMapFile : jsOutputSourceMapFile, *extraArgs)
|
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
|
|
|
|
if (enableHermes) {
|
|
|
|
doLast {
|
2021-10-13 22:49:02 +03:00
|
|
|
def hermesFlags = hermesFlagsForVariant(variant)
|
2019-07-26 08:59:00 +03:00
|
|
|
def hbcTempFile = file("${jsBundleFile}.hbc")
|
|
|
|
exec {
|
2019-09-26 03:49:43 +03:00
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
commandLine("cmd", "/c", getHermesCommand(), "-emit-binary", "-out", hbcTempFile, jsBundleFile, *hermesFlags)
|
|
|
|
} else {
|
|
|
|
commandLine(getHermesCommand(), "-emit-binary", "-out", hbcTempFile, jsBundleFile, *hermesFlags)
|
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
ant.move(
|
|
|
|
file: hbcTempFile,
|
|
|
|
toFile: jsBundleFile
|
|
|
|
);
|
|
|
|
if (hermesFlags.contains("-output-source-map")) {
|
|
|
|
ant.move(
|
|
|
|
// Hermes will generate a source map with this exact name
|
|
|
|
file: "${jsBundleFile}.hbc.map",
|
|
|
|
tofile: jsCompilerSourceMapFile
|
|
|
|
);
|
|
|
|
exec {
|
|
|
|
// TODO: set task dependencies for caching
|
|
|
|
|
|
|
|
// Set up the call to the compose-source-maps script
|
|
|
|
workingDir(reactRoot)
|
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
commandLine("cmd", "/c", *nodeExecutableAndArgs, composeSourceMapsPath, jsPackagerSourceMapFile, jsCompilerSourceMapFile, "-o", jsOutputSourceMapFile)
|
|
|
|
} else {
|
|
|
|
commandLine(*nodeExecutableAndArgs, composeSourceMapsPath, jsPackagerSourceMapFile, jsCompilerSourceMapFile, "-o", jsOutputSourceMapFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
Add bundleForVariant option (#32472)
Summary:
Ref https://github.com/facebook/react-native/pull/30606#issuecomment-948458552
## Changelog
[Android] [Added] - Add bundleForVariant option
Pull Request resolved: https://github.com/facebook/react-native/pull/32472
Test Plan:
I added the following log into react.gradle and ran the Android build for my app:
```
println("bundleEnabled: ${targetName}, ${bundleForVariant(variant)}")
```
```
# build.gradle
project.ext.react = [
entryFile: "index.android.js",
enableHermes: true, // clean and rebuild if changing
bundleForVariant: {
def variant -> variant.name.toLowerCase().contains('release') || variant.name.toLowerCase().contains('live')
},
]
...
flavorDimensions 'branding'
productFlavors {
cve {
dimension 'branding'
}
whce {
dimension 'branding'
}
}
```
Console output:
```
Reading env from: env/cve/live
bundleEnabled: CveDebug, false
bundleEnabled: CveRelease, true
bundleEnabled: CveLive, true
bundleEnabled: WhceDebug, false
bundleEnabled: WhceRelease, true
bundleEnabled: WhceLive, true
```
Reviewed By: cortinico, ryancat
Differential Revision: D31910406
Pulled By: ShikaSD
fbshipit-source-id: baca5efaddedddad15d974cc7bb8f3c2a4c4f35b
2021-10-26 14:57:44 +03:00
|
|
|
enabled bundleForVariant(variant)
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Expose a minimal interface on the application variant and the task itself:
|
|
|
|
variant.ext.bundleJsAndAssets = currentBundleTask
|
|
|
|
currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
|
|
|
|
currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
|
|
|
|
|
|
|
|
// registerGeneratedResFolders for Android plugin 3.x
|
|
|
|
if (variant.respondsTo("registerGeneratedResFolders")) {
|
|
|
|
variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
|
|
|
|
} else {
|
|
|
|
variant.registerResGeneratingTask(currentBundleTask)
|
|
|
|
}
|
- update to gradle 4.10.1 or high (#23103)
Summary:
Add suport to gradle 4.10.1 or high!
The new version of android studio 3.3 recommendete to update gradle project to 4.10.1
> To take advantage of the latest features, improvements, and security fixes, we strongly recommend that you update the Android Gradle plugin to version 3.3.0 and Gradle to version 4.10.1. [Release notes ](https://developer.android.com/studio/releases/gradle-plugin)
>Android plugin 3.2.0 and higher now support building the Android App Bundle—a new upload format that defers APK generation and signing to compatible app stores, such as Google Play. With app bundles, you no longer have to build, sign, and manage multiple APKs, and users get smaller, more optimized downloads. [Learn more](https://developer.android.com/guide/app-bundle/?utm_source=android-studio)
but if the upgrade to the new Android gradle many warnings come up, becouse meny things was obsoleted
> WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
> WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.
> WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.
> It will be removed at the end of 2019.
> For more information, [see ](https://d.android.com/r/tools/task-configuration-avoidance.)
> To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display a stack trace.
Changelog:
----------
[Android] [Deprecated] - fix warinings obsolete to update to gradle 4.10.1 or high
Pull Request resolved: https://github.com/facebook/react-native/pull/23103
Differential Revision: D13817123
Pulled By: cpojer
fbshipit-source-id: 9816e20145a5fded2702cf9317cfb6862f3ebd8b
2019-01-25 14:12:51 +03:00
|
|
|
variant.mergeResourcesProvider.get().dependsOn(currentBundleTask)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// packageApplication for Android plugin 3.x
|
|
|
|
def packageTask = variant.hasProperty("packageApplication")
|
- update to gradle 4.10.1 or high (#23103)
Summary:
Add suport to gradle 4.10.1 or high!
The new version of android studio 3.3 recommendete to update gradle project to 4.10.1
> To take advantage of the latest features, improvements, and security fixes, we strongly recommend that you update the Android Gradle plugin to version 3.3.0 and Gradle to version 4.10.1. [Release notes ](https://developer.android.com/studio/releases/gradle-plugin)
>Android plugin 3.2.0 and higher now support building the Android App Bundle—a new upload format that defers APK generation and signing to compatible app stores, such as Google Play. With app bundles, you no longer have to build, sign, and manage multiple APKs, and users get smaller, more optimized downloads. [Learn more](https://developer.android.com/guide/app-bundle/?utm_source=android-studio)
but if the upgrade to the new Android gradle many warnings come up, becouse meny things was obsoleted
> WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
> WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.
> WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.
> It will be removed at the end of 2019.
> For more information, [see ](https://d.android.com/r/tools/task-configuration-avoidance.)
> To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display a stack trace.
Changelog:
----------
[Android] [Deprecated] - fix warinings obsolete to update to gradle 4.10.1 or high
Pull Request resolved: https://github.com/facebook/react-native/pull/23103
Differential Revision: D13817123
Pulled By: cpojer
fbshipit-source-id: 9816e20145a5fded2702cf9317cfb6862f3ebd8b
2019-01-25 14:12:51 +03:00
|
|
|
? variant.packageApplicationProvider.get()
|
2018-08-04 02:55:37 +03:00
|
|
|
: tasks.findByName("package${targetName}")
|
2018-12-07 07:30:24 +03:00
|
|
|
if (variant.hasProperty("packageLibrary")) {
|
|
|
|
packageTask = variant.packageLibrary
|
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2019-01-15 13:11:11 +03:00
|
|
|
// pre bundle build task for Android plugin 3.2+
|
|
|
|
def buildPreBundleTask = tasks.findByName("build${targetName}PreBundle")
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
def resourcesDirConfigValue = config."resourcesDir${targetName}"
|
|
|
|
if (resourcesDirConfigValue) {
|
|
|
|
def currentCopyResTask = tasks.create(
|
|
|
|
name: "copy${targetName}BundledResources",
|
|
|
|
type: Copy) {
|
2016-01-08 23:11:34 +03:00
|
|
|
group = "react"
|
2018-08-04 02:55:37 +03:00
|
|
|
description = "copy bundled resources into custom location for ${targetName}."
|
|
|
|
|
2019-02-09 21:14:55 +03:00
|
|
|
from(resourcesDir)
|
|
|
|
into(file(resourcesDirConfigValue))
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
dependsOn(currentBundleTask)
|
|
|
|
|
2019-02-09 21:14:55 +03:00
|
|
|
enabled(currentBundleTask.enabled)
|
2016-01-08 23:11:34 +03:00
|
|
|
}
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
packageTask.dependsOn(currentCopyResTask)
|
2019-01-15 13:11:11 +03:00
|
|
|
if (buildPreBundleTask != null) {
|
|
|
|
buildPreBundleTask.dependsOn(currentCopyResTask)
|
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
def currentAssetsCopyTask = tasks.create(
|
|
|
|
name: "copy${targetName}BundledJs",
|
|
|
|
type: Copy) {
|
|
|
|
group = "react"
|
|
|
|
description = "copy bundled JS into ${targetName}."
|
2016-01-08 23:11:34 +03:00
|
|
|
|
2022-02-21 17:14:17 +03:00
|
|
|
from(jsBundleDir)
|
2018-10-02 12:55:40 +03:00
|
|
|
if (config."jsBundleDir${targetName}") {
|
2019-02-09 21:14:55 +03:00
|
|
|
into(file(config."jsBundleDir${targetName}"))
|
2018-10-02 12:55:40 +03:00
|
|
|
} else {
|
|
|
|
into ("$buildDir/intermediates")
|
2021-08-23 21:37:35 +03:00
|
|
|
if (isAndroidLibrary) {
|
2022-02-21 17:14:17 +03:00
|
|
|
into ("library_assets/${variant.name}/out")
|
2021-08-23 21:37:35 +03:00
|
|
|
} else {
|
2022-02-21 17:14:17 +03:00
|
|
|
into ("assets/${targetPath}")
|
2018-10-02 12:55:40 +03:00
|
|
|
|
2021-08-23 21:37:35 +03:00
|
|
|
// Workaround for Android Gradle Plugin 3.2+ new asset directory
|
2022-02-21 17:14:17 +03:00
|
|
|
into ("merged_assets/${variant.name}/merge${targetName}Assets/out")
|
2019-04-27 19:39:35 +03:00
|
|
|
|
2021-08-23 21:37:35 +03:00
|
|
|
// Workaround for Android Gradle Plugin 3.4+ new asset directory
|
2022-02-21 17:14:17 +03:00
|
|
|
into ("merged_assets/${variant.name}/out")
|
|
|
|
|
|
|
|
// Workaround for Android Gradle Plugin 7.1 asset directory
|
|
|
|
into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
|
2019-04-27 19:39:35 +03:00
|
|
|
}
|
2018-10-02 12:55:40 +03:00
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// mergeAssets must run first, as it clears the intermediates directory
|
- update to gradle 4.10.1 or high (#23103)
Summary:
Add suport to gradle 4.10.1 or high!
The new version of android studio 3.3 recommendete to update gradle project to 4.10.1
> To take advantage of the latest features, improvements, and security fixes, we strongly recommend that you update the Android Gradle plugin to version 3.3.0 and Gradle to version 4.10.1. [Release notes ](https://developer.android.com/studio/releases/gradle-plugin)
>Android plugin 3.2.0 and higher now support building the Android App Bundle—a new upload format that defers APK generation and signing to compatible app stores, such as Google Play. With app bundles, you no longer have to build, sign, and manage multiple APKs, and users get smaller, more optimized downloads. [Learn more](https://developer.android.com/guide/app-bundle/?utm_source=android-studio)
but if the upgrade to the new Android gradle many warnings come up, becouse meny things was obsoleted
> WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
> WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.
> WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.
> It will be removed at the end of 2019.
> For more information, [see ](https://d.android.com/r/tools/task-configuration-avoidance.)
> To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display a stack trace.
Changelog:
----------
[Android] [Deprecated] - fix warinings obsolete to update to gradle 4.10.1 or high
Pull Request resolved: https://github.com/facebook/react-native/pull/23103
Differential Revision: D13817123
Pulled By: cpojer
fbshipit-source-id: 9816e20145a5fded2702cf9317cfb6862f3ebd8b
2019-01-25 14:12:51 +03:00
|
|
|
dependsOn(variant.mergeAssetsProvider.get())
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2019-02-09 21:14:55 +03:00
|
|
|
enabled(currentBundleTask.enabled)
|
2021-08-23 21:37:35 +03:00
|
|
|
dependsOn(currentBundleTask)
|
2016-01-08 23:11:34 +03:00
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2020-10-27 02:04:06 +03:00
|
|
|
// mergeResources task runs before the bundle file is copied to the intermediate asset directory from Android plugin 4.1+.
|
|
|
|
// This ensures to copy the bundle file before mergeResources task starts
|
|
|
|
def mergeResourcesTask = tasks.findByName("merge${targetName}Resources")
|
|
|
|
mergeResourcesTask.dependsOn(currentAssetsCopyTask)
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
packageTask.dependsOn(currentAssetsCopyTask)
|
2019-01-15 13:11:11 +03:00
|
|
|
if (buildPreBundleTask != null) {
|
|
|
|
buildPreBundleTask.dependsOn(currentAssetsCopyTask)
|
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
|
|
|
|
// Delete the VM related libraries that this build doesn't need.
|
|
|
|
// The application can manage this manually by setting 'enableVmCleanup: false'
|
|
|
|
//
|
2020-11-18 23:10:59 +03:00
|
|
|
// This should really be done by packaging all Hermes related libs into
|
2019-07-26 08:59:00 +03:00
|
|
|
// two separate HermesDebug and HermesRelease AARs, but until then we'll
|
|
|
|
// kludge it by deleting the .so files out of the /transforms/ directory.
|
2021-10-13 22:49:02 +03:00
|
|
|
def cleanup = deleteDebugFilesForVariant(variant)
|
gradle vm cleanup fix (#32257)
Summary:
This patch remove unused .so files for reduce android .apk and .aab
## Changelog
- [Android] [Fixed] - Exclude unused .so files for reduce android .apk and .aab
Pull Request resolved: https://github.com/facebook/react-native/pull/32257
Test Plan:
I have created a repository for testing:
https://github.com/enniel/react-native-invalid-build-example
That lines includes patch for fix bug:
https://github.com/enniel/react-native-invalid-build-example/blob/f195ecdbeaca88ffb57c344615ede45ea0f6ef57/android/app/react.gradle#L331-L385
```sh
git clone https://github.com/enniel/react-native-invalid-build-example
cd react-native-invalid-build-example
npm i
```
debug, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134640636-1505cfa4-0be9-4bb8-8130-74af01ebfd94.png)
debug, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134640743-f5730fbe-433f-45eb-a87c-e0e2eadb056b.png)
debug, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134640895-36f294ae-36fb-40b7-a767-f6b421fdbabd.png)
debug, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641040-f4f08755-5234-4567-849d-0b815d58bc15.png)
release, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134641255-da3ccc5f-91e2-4b12-b0b2-1590fa13e5ce.png)
release, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134641396-f2ca3178-4225-4de7-b1f7-b741edba1877.png)
release, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134641675-b967df44-af1b-4070-9f84-a2f029381a39.png)
release, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641737-aa4a435a-1fe2-4107-8bbd-8dadda24aebd.png)
Reviewed By: cortinico
Differential Revision: D31167423
Pulled By: ShikaSD
fbshipit-source-id: 4026df818c57fa699526ca1c31c1d1a68d58baef
2021-09-27 16:53:11 +03:00
|
|
|
|
|
|
|
def vmSelectionAction = { libDir ->
|
2019-07-26 08:59:00 +03:00
|
|
|
fileTree(libDir).matching {
|
|
|
|
if (enableHermes) {
|
|
|
|
// For Hermes, delete all the libjsc* files
|
|
|
|
include "**/libjsc*.so"
|
|
|
|
|
2021-10-13 22:49:02 +03:00
|
|
|
if (cleanup) {
|
2019-07-26 08:59:00 +03:00
|
|
|
// Reduce size by deleting the debugger/inspector
|
|
|
|
include '**/libhermes-executor-debug.so'
|
|
|
|
} else {
|
|
|
|
// Release libs take precedence and must be removed
|
|
|
|
// to allow debugging
|
|
|
|
include '**/libhermes-executor-release.so'
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// For JSC, delete all the libhermes* files
|
|
|
|
include "**/libhermes*.so"
|
|
|
|
}
|
|
|
|
}.visit { details ->
|
2021-10-18 14:32:45 +03:00
|
|
|
def targetVariant1 = ".*/transforms/[^/]*/${variant.name}/.*"
|
|
|
|
def targetVariant2 = ".*/merged_native_libs/${variant.name}/out/lib/.*"
|
|
|
|
def targetVariant3 = ".*/stripped_native_libs/${variant.name}/out/lib/.*"
|
2019-07-26 08:59:00 +03:00
|
|
|
def path = details.file.getAbsolutePath().replace(File.separatorChar, '/' as char)
|
gradle vm cleanup fix (#32257)
Summary:
This patch remove unused .so files for reduce android .apk and .aab
## Changelog
- [Android] [Fixed] - Exclude unused .so files for reduce android .apk and .aab
Pull Request resolved: https://github.com/facebook/react-native/pull/32257
Test Plan:
I have created a repository for testing:
https://github.com/enniel/react-native-invalid-build-example
That lines includes patch for fix bug:
https://github.com/enniel/react-native-invalid-build-example/blob/f195ecdbeaca88ffb57c344615ede45ea0f6ef57/android/app/react.gradle#L331-L385
```sh
git clone https://github.com/enniel/react-native-invalid-build-example
cd react-native-invalid-build-example
npm i
```
debug, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134640636-1505cfa4-0be9-4bb8-8130-74af01ebfd94.png)
debug, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134640743-f5730fbe-433f-45eb-a87c-e0e2eadb056b.png)
debug, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134640895-36f294ae-36fb-40b7-a767-f6b421fdbabd.png)
debug, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641040-f4f08755-5234-4567-849d-0b815d58bc15.png)
release, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134641255-da3ccc5f-91e2-4b12-b0b2-1590fa13e5ce.png)
release, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134641396-f2ca3178-4225-4de7-b1f7-b741edba1877.png)
release, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134641675-b967df44-af1b-4070-9f84-a2f029381a39.png)
release, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641737-aa4a435a-1fe2-4107-8bbd-8dadda24aebd.png)
Reviewed By: cortinico
Differential Revision: D31167423
Pulled By: ShikaSD
fbshipit-source-id: 4026df818c57fa699526ca1c31c1d1a68d58baef
2021-09-27 16:53:11 +03:00
|
|
|
if ((path.matches(targetVariant1) || path.matches(targetVariant2) || path.matches(targetVariant3)) && details.file.isFile()) {
|
2019-08-12 12:42:00 +03:00
|
|
|
details.file.delete()
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (enableVmCleanup) {
|
gradle vm cleanup fix (#32257)
Summary:
This patch remove unused .so files for reduce android .apk and .aab
## Changelog
- [Android] [Fixed] - Exclude unused .so files for reduce android .apk and .aab
Pull Request resolved: https://github.com/facebook/react-native/pull/32257
Test Plan:
I have created a repository for testing:
https://github.com/enniel/react-native-invalid-build-example
That lines includes patch for fix bug:
https://github.com/enniel/react-native-invalid-build-example/blob/f195ecdbeaca88ffb57c344615ede45ea0f6ef57/android/app/react.gradle#L331-L385
```sh
git clone https://github.com/enniel/react-native-invalid-build-example
cd react-native-invalid-build-example
npm i
```
debug, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134640636-1505cfa4-0be9-4bb8-8130-74af01ebfd94.png)
debug, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134640743-f5730fbe-433f-45eb-a87c-e0e2eadb056b.png)
debug, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134640895-36f294ae-36fb-40b7-a767-f6b421fdbabd.png)
debug, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641040-f4f08755-5234-4567-849d-0b815d58bc15.png)
release, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134641255-da3ccc5f-91e2-4b12-b0b2-1590fa13e5ce.png)
release, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134641396-f2ca3178-4225-4de7-b1f7-b741edba1877.png)
release, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134641675-b967df44-af1b-4070-9f84-a2f029381a39.png)
release, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641737-aa4a435a-1fe2-4107-8bbd-8dadda24aebd.png)
Reviewed By: cortinico
Differential Revision: D31167423
Pulled By: ShikaSD
fbshipit-source-id: 4026df818c57fa699526ca1c31c1d1a68d58baef
2021-09-27 16:53:11 +03:00
|
|
|
def task = tasks.findByName("package${targetName}")
|
2022-03-09 00:35:28 +03:00
|
|
|
if (task != null) {
|
|
|
|
def transformsLibDir = "$buildDir/intermediates/transforms/"
|
|
|
|
task.doFirst { vmSelectionAction(transformsLibDir) }
|
|
|
|
}
|
gradle vm cleanup fix (#32257)
Summary:
This patch remove unused .so files for reduce android .apk and .aab
## Changelog
- [Android] [Fixed] - Exclude unused .so files for reduce android .apk and .aab
Pull Request resolved: https://github.com/facebook/react-native/pull/32257
Test Plan:
I have created a repository for testing:
https://github.com/enniel/react-native-invalid-build-example
That lines includes patch for fix bug:
https://github.com/enniel/react-native-invalid-build-example/blob/f195ecdbeaca88ffb57c344615ede45ea0f6ef57/android/app/react.gradle#L331-L385
```sh
git clone https://github.com/enniel/react-native-invalid-build-example
cd react-native-invalid-build-example
npm i
```
debug, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134640636-1505cfa4-0be9-4bb8-8130-74af01ebfd94.png)
debug, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134640743-f5730fbe-433f-45eb-a87c-e0e2eadb056b.png)
debug, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134640895-36f294ae-36fb-40b7-a767-f6b421fdbabd.png)
debug, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641040-f4f08755-5234-4567-849d-0b815d58bc15.png)
release, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134641255-da3ccc5f-91e2-4b12-b0b2-1590fa13e5ce.png)
release, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134641396-f2ca3178-4225-4de7-b1f7-b741edba1877.png)
release, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134641675-b967df44-af1b-4070-9f84-a2f029381a39.png)
release, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641737-aa4a435a-1fe2-4107-8bbd-8dadda24aebd.png)
Reviewed By: cortinico
Differential Revision: D31167423
Pulled By: ShikaSD
fbshipit-source-id: 4026df818c57fa699526ca1c31c1d1a68d58baef
2021-09-27 16:53:11 +03:00
|
|
|
|
|
|
|
def sTask = tasks.findByName("strip${targetName}DebugSymbols")
|
|
|
|
if (sTask != null) {
|
2021-10-18 14:32:45 +03:00
|
|
|
def strippedLibDir = "$buildDir/intermediates/stripped_native_libs/${variant.name}/out/lib/"
|
gradle vm cleanup fix (#32257)
Summary:
This patch remove unused .so files for reduce android .apk and .aab
## Changelog
- [Android] [Fixed] - Exclude unused .so files for reduce android .apk and .aab
Pull Request resolved: https://github.com/facebook/react-native/pull/32257
Test Plan:
I have created a repository for testing:
https://github.com/enniel/react-native-invalid-build-example
That lines includes patch for fix bug:
https://github.com/enniel/react-native-invalid-build-example/blob/f195ecdbeaca88ffb57c344615ede45ea0f6ef57/android/app/react.gradle#L331-L385
```sh
git clone https://github.com/enniel/react-native-invalid-build-example
cd react-native-invalid-build-example
npm i
```
debug, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134640636-1505cfa4-0be9-4bb8-8130-74af01ebfd94.png)
debug, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134640743-f5730fbe-433f-45eb-a87c-e0e2eadb056b.png)
debug, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134640895-36f294ae-36fb-40b7-a767-f6b421fdbabd.png)
debug, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641040-f4f08755-5234-4567-849d-0b815d58bc15.png)
release, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134641255-da3ccc5f-91e2-4b12-b0b2-1590fa13e5ce.png)
release, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134641396-f2ca3178-4225-4de7-b1f7-b741edba1877.png)
release, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134641675-b967df44-af1b-4070-9f84-a2f029381a39.png)
release, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641737-aa4a435a-1fe2-4107-8bbd-8dadda24aebd.png)
Reviewed By: cortinico
Differential Revision: D31167423
Pulled By: ShikaSD
fbshipit-source-id: 4026df818c57fa699526ca1c31c1d1a68d58baef
2021-09-27 16:53:11 +03:00
|
|
|
sTask.doLast { vmSelectionAction(strippedLibDir) }
|
|
|
|
}
|
|
|
|
|
|
|
|
def mTask = tasks.findByName("merge${targetName}NativeLibs")
|
|
|
|
if (mTask != null) {
|
2021-10-18 14:32:45 +03:00
|
|
|
def mergedLibDir = "$buildDir/intermediates/merged_native_libs/${variant.name}/out/lib/"
|
gradle vm cleanup fix (#32257)
Summary:
This patch remove unused .so files for reduce android .apk and .aab
## Changelog
- [Android] [Fixed] - Exclude unused .so files for reduce android .apk and .aab
Pull Request resolved: https://github.com/facebook/react-native/pull/32257
Test Plan:
I have created a repository for testing:
https://github.com/enniel/react-native-invalid-build-example
That lines includes patch for fix bug:
https://github.com/enniel/react-native-invalid-build-example/blob/f195ecdbeaca88ffb57c344615ede45ea0f6ef57/android/app/react.gradle#L331-L385
```sh
git clone https://github.com/enniel/react-native-invalid-build-example
cd react-native-invalid-build-example
npm i
```
debug, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134640636-1505cfa4-0be9-4bb8-8130-74af01ebfd94.png)
debug, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134640743-f5730fbe-433f-45eb-a87c-e0e2eadb056b.png)
debug, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134640895-36f294ae-36fb-40b7-a767-f6b421fdbabd.png)
debug, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:debug:apk
```
open android/app/build/outputs/apk/debug/app-debug.apk in android studio
![debug-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641040-f4f08755-5234-4567-849d-0b815d58bc15.png)
release, hermes disabled, without patch
```sh
git switch hermes-disabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-without-patch](https://user-images.githubusercontent.com/19760944/134641255-da3ccc5f-91e2-4b12-b0b2-1590fa13e5ce.png)
release, hermes enabled, without patch
```sh
git switch hermes-enabled-without-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-without-patch](https://user-images.githubusercontent.com/19760944/134641396-f2ca3178-4225-4de7-b1f7-b741edba1877.png)
release, hermes disabled, with patch
```sh
git switch hermes-disabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-disabled-with-patch](https://user-images.githubusercontent.com/19760944/134641675-b967df44-af1b-4070-9f84-a2f029381a39.png)
release, hermes enabled, with patch
```sh
git switch hermes-enabled-with-patch
npm run build:android:release:apk
```
open android/app/build/outputs/apk/release/app-release.apk in android studio
![release-hermes-enabled-with-patch](https://user-images.githubusercontent.com/19760944/134641737-aa4a435a-1fe2-4107-8bbd-8dadda24aebd.png)
Reviewed By: cortinico
Differential Revision: D31167423
Pulled By: ShikaSD
fbshipit-source-id: 4026df818c57fa699526ca1c31c1d1a68d58baef
2021-09-27 16:53:11 +03:00
|
|
|
mTask.doLast { vmSelectionAction(mergedLibDir) }
|
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
2016-01-08 23:11:34 +03:00
|
|
|
}
|
2015-10-19 16:32:02 +03:00
|
|
|
}
|