Skip to content

Commit

Permalink
Remove unused feature_of/feature_after support from ResourceProcessor…
Browse files Browse the repository at this point in the history
…BusyBox

This was never launched and depends on flags which exist in aapt but not
aapt2.  Bazel was updated in 0bb860d.

PiperOrigin-RevId: 268144225
  • Loading branch information
donaldchai authored and Copybara-Service committed Sep 10, 2019
1 parent 6842af0 commit 98155e1
Showing 1 changed file with 1 addition and 32 deletions.
Expand Up @@ -88,28 +88,6 @@ public static final class AaptConfigOptions extends OptionsBase {
)
public Path aapt;

@Option(
name = "featureOf",
defaultValue = "null",
converter = ExistingPathConverter.class,
category = "config",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
help = "Base apk path."
)
public Path featureOf;

@Option(
name = "featureAfter",
defaultValue = "null",
converter = ExistingPathConverter.class,
category = "config",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
help = "Apk path of previous split (if any)."
)
public Path featureAfter;

@Option(
name = "androidJar",
defaultValue = "null",
Expand Down Expand Up @@ -211,16 +189,7 @@ public boolean getFailOnMissingConfigEntry() {

@Override
public List<String> getAdditionalParameters() {
List<String> params = new java.util.ArrayList<String>();
if (options.featureOf != null) {
params.add("--feature-of");
params.add(options.featureOf.toString());
}
if (options.featureAfter != null) {
params.add("--feature-after");
params.add(options.featureAfter.toString());
}
return ImmutableList.copyOf(params);
return ImmutableList.of();
}
}

Expand Down

0 comments on commit 98155e1

Please sign in to comment.