Fix Product Flavour builds

[jaggs6]

• Capitalise productFlavorName for target path
• Capitalise buildType in sourceName when flavour exists
• Fix the path the assets are added.
• Backward compatibility with bundleIn(buildTypeName) when flavours are added

[facebook-github-bot]

By analyzing the blame information on this pull request, we identified @AndrewJack, @foghina and @mkonicek to be potential reviewers.

[facebook-github-bot]

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla - and if you have received this in error or have any questions, please drop us a line at cla@fb.com. Thanks!

[facebook-github-bot]

@jaggs6 updated the pull request.

[facebook-github-bot]

@jaggs6 updated the pull request.

[facebook-github-bot]

@jaggs6 updated the pull request.

[facebook-github-bot]

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

[AndrewJack]

Looks good 👍

[martnu]

Won't this become the gradle task assembleflavorDebug when we want assembleFlavorDebug?

[jaggs6]

Nope, Because it will use the targetName variable everywhere and not the sourceName one.

[AndrewJack]

It uses targetName to generate the task name:

// Bundle task name for variant
def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"

[martnu]

Ok! What about

def targetName = "${productFlavorName.capitalize()}${buildTypeName.capitalize()}"
def targetPath = "${buildTypeName}"
if (productFlavorName) {
  targetPath = "${productFlavorName}/${buildTypeName}"
}

to make it more readable and if we're not using sourceName anymore?

[jaggs6]

Looks good. Let me test it.

[AndrewJack]

👍 yep thats better. Are we going to use this PR or #5579 ?

[facebook-github-bot]

@jaggs6 updated the pull request.

[jaggs6]

@foghina and @mkonicek what do you guys think?

[mkonicek]

Looks good. How did you test this? Can you show some short examples of commands you ran to demo it works? It's just thing we do at fb that every commit should have so a called "Test Plan".

[jaggs6]

@mkonicek thanks for looking into it. Here is how to test each change.

1. and 2) just run ./gradlew tasks in the android folder (you will see the new task names capitalises properly) you will have to put print $targetName below my assignment change to see the diff.

2. (without my change) just make a flavour in the app/build.gradle and then run the app for that flavour. make sure you are running the release verison of that flavour. You will notice that it requires the react native server running even for a flavoured release build. This is because the wrong asset folder was being bundled. My change fixes that.

3. add bundleInSnapshot true in the config on top of the app/build.gradle. and add a build type snapshot. you will see that it maintains the bundle option to true for all the flavours in that build type.

[jaggs6]

@mkonicek does the above answer your question?

[mkonicek]

Cool, thanks for the test plan. Let's merge it. Sorry for the delay, just came back from vacation.

@facebook-github-bot shipit

[facebook-github-bot]

Thanks for importing. If you are an FB employee go to https://our.intern.facebook.com/intern/opensource/github/pull_request/1667939000161821/int_phab to review.