Skip to content

Commit eda202e

Browse files
Ritesh KadmawalaMorgan Pretty
authored andcommitted
Fixed the issue due to which js assets are not bundled in the apk when separate build for different CPU architectures is enabled
Summary: This PR tries to fix a minor bug in `react.gradle` due to which task that bundles JS into the assets folder of the APK is not run when separate build per CPU architecture is enabled and we are using different product flavors. Closes facebook#8675 Differential Revision: D3541348 fbshipit-source-id: 4c84f21a06a45046f84bdd8ae5c5d834ec080476
1 parent 288dcf5 commit eda202e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

react.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ gradle.projectsEvaluated {
3131
productFlavors.each { productFlavorName ->
3232
buildTypes.each { buildTypeName ->
3333
// Create variant and target names
34-
def targetName = "${productFlavorName.capitalize()}${buildTypeName.capitalize()}"
34+
def flavorNameCapitalized = "${productFlavorName.capitalize()}"
35+
def buildNameCapitalized = "${buildTypeName.capitalize()}"
36+
def targetName = "${flavorNameCapitalized}${buildNameCapitalized}"
3537
def targetPath = productFlavorName ?
3638
"${productFlavorName}/${buildTypeName}" :
3739
"${buildTypeName}"
@@ -92,8 +94,8 @@ gradle.projectsEvaluated {
9294
currentBundleTask.dependsOn("merge${targetName}Resources")
9395
currentBundleTask.dependsOn("merge${targetName}Assets")
9496

95-
runBefore("processArmeabi-v7a${targetName}Resources", currentBundleTask)
96-
runBefore("processX86${targetName}Resources", currentBundleTask)
97+
runBefore("process${flavorNameCapitalized}Armeabi-v7a${buildNameCapitalized}Resources", currentBundleTask)
98+
runBefore("process${flavorNameCapitalized}X86${buildNameCapitalized}Resources", currentBundleTask)
9799
runBefore("processUniversal${targetName}Resources", currentBundleTask)
98100
runBefore("process${targetName}Resources", currentBundleTask)
99101
}

0 commit comments

Comments
 (0)