Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicting resources merging order #273

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix conflicting resources merging order #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions src/tools/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,15 @@ public static final class Options {
splitter = ColonSplitter.class,
description = "List of reource only APK files to link against.")
public List<Path> resourceApks = ImmutableList.of();

@Option(
name = "legacyResourceOrder",
defaultValue = "false",
category = "config",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
help = "If passed, resource merge conflicts will give precedence to value defined last in directData/transitiveData inputs.")
public boolean legacyResourceOrder;
}

public static void main(String[] args) throws Exception {
Expand Down Expand Up @@ -351,12 +360,22 @@ public static void main(String[] args) throws Exception {
AndroidResourceOutputs.copyManifestToOutput(compiled, options.manifestOutput);
}

List<CompiledResources> compiledResourceDeps =
// Last defined dependencies will overwrite previous one, so always place direct
// after transitive.
concat(options.transitiveData.stream(), options.directData.stream())
.map(DependencyAndroidData::getCompiledSymbols)
.collect(toList());
List<CompiledResources> compiledResourceDeps;
if (options.legacyResourceOrder) {
// Last defined dependencies will overwrite previous one, so always place direct
// after transitive.
compiledResourceDeps = concat(options.transitiveData.stream(), options.directData.stream())
.map(DependencyAndroidData::getCompiledSymbols)
.collect(toList());
} else {
// In this case, we do not want last defined resource to overwrite previous one.
// This allow, for example, resources defined in primary target to have precendence
// over resources defined in a direct dependency.
compiledResourceDeps = concat(options.directData.stream(), options.transitiveData.stream())
.map(DependencyAndroidData::getCompiledSymbols)
.collect(toList());
Collections.reverse(compiledResourceDeps);
}

// NB: "-A" options are in *decreasing* precedence, while "-R" options are in *increasing*
// precedence. While this is internally inconsistent, it matches AAPTv1's treatment of "-A".
Expand Down