use of com.android.bundle.Targeting.ApkTargeting in project bundletool by google.
the class TargetingNormalizerTest method normalizeScreenDensityTargeting.
@Test
public void normalizeScreenDensityTargeting() {
ApkTargeting targeting = apkDensityTargeting(ScreenDensityTargeting.newBuilder().addAllValue(ImmutableList.of(toScreenDensity(LDPI), toScreenDensity(MDPI), toScreenDensity(HDPI), toScreenDensity(150), toScreenDensity(200))).addAllAlternatives(ImmutableList.of(toScreenDensity(XHDPI), toScreenDensity(XXXHDPI), toScreenDensity(NODPI), toScreenDensity(400), toScreenDensity(800))).build());
ApkTargeting normalized = TargetingNormalizer.normalizeApkTargeting(targeting);
assertThat(normalized).isEqualTo(apkDensityTargeting(ScreenDensityTargeting.newBuilder().addAllValue(ImmutableList.of(toScreenDensity(LDPI), toScreenDensity(150), toScreenDensity(MDPI), toScreenDensity(200), toScreenDensity(HDPI))).addAllAlternatives(ImmutableList.of(toScreenDensity(XHDPI), toScreenDensity(400), toScreenDensity(XXXHDPI), toScreenDensity(800), toScreenDensity(NODPI))).build()));
}
use of com.android.bundle.Targeting.ApkTargeting in project bundletool by google.
the class TargetingNormalizerTest method normalizeApkTargeting_allTargetingDimensionsAreHandled.
@Test
public void normalizeApkTargeting_allTargetingDimensionsAreHandled() {
ApkTargeting apkTargeting = ProtoFuzzer.randomProtoMessage(ApkTargeting.class);
ApkTargeting shuffledApkTargeting = ProtoFuzzer.shuffleRepeatedFields(apkTargeting);
// Sanity-check that the testing data was generated alright.
assertThat(apkTargeting).isNotEqualTo(shuffledApkTargeting);
// The following check fails, if the normalizing logic forgets to handle some dimension.
// This would typically happen when the targeting proto is extended by a new dimension.
assertThat(TargetingNormalizer.normalizeApkTargeting(apkTargeting)).isEqualTo(TargetingNormalizer.normalizeApkTargeting(shuffledApkTargeting));
}
use of com.android.bundle.Targeting.ApkTargeting in project bundletool by google.
the class SameTargetingMerger method merge.
@Override
public ImmutableList<ModuleSplit> merge(ImmutableCollection<ModuleSplit> moduleSplits) {
checkArgument(moduleSplits.stream().map(ModuleSplit::getVariantTargeting).distinct().count() == 1, "SameTargetingMerger doesn't support merging splits from different variants.");
ImmutableList.Builder<ModuleSplit> result = ImmutableList.builder();
ImmutableListMultimap<ApkTargeting, ModuleSplit> splitsByTargeting = Multimaps.index(moduleSplits, ModuleSplit::getApkTargeting);
for (ApkTargeting targeting : splitsByTargeting.keySet()) {
result.add(mergeSplits(splitsByTargeting.get(targeting)));
}
return result.build();
}
use of com.android.bundle.Targeting.ApkTargeting in project bundletool by google.
the class AssetsDimensionSplitterFactory method createSplitter.
/**
* Creates a {@link ModuleSplitSplitter} capable of splitting on a given Asset targeting
* dimension, with, optionally, a dimension to be removed from asset paths.
*
* @param <T> the proto buffer message class representing the splitting targeting dimension.
* @param dimensionGetter function that extracts the sub-message representing a targeting
* dimension.
* @param targetingSetter function that creates a split targeting that will be merged with the
* targeting of the input {@link ModuleSplit}.
* @param hasTargeting predicate to test if the input {@link ModuleSplit} is already targeting on
* the dimension of this splitter.
* @param targetingDimensionToRemove If not empty, the targeting for this dimension will be
* removed from asset paths (i.e: suffixes like #tcf_xxx will be removed from paths).
* @return {@link ModuleSplitSplitter} for a given dimension functions.
*/
public static <T extends Message> ModuleSplitSplitter createSplitter(Function<AssetsDirectoryTargeting, T> dimensionGetter, Function<T, ApkTargeting> targetingSetter, Predicate<ApkTargeting> hasTargeting, Optional<TargetingDimension> targetingDimensionToRemove) {
return new ModuleSplitSplitter() {
@Override
public ImmutableCollection<ModuleSplit> split(ModuleSplit split) {
checkArgument(!hasTargeting.test(split.getApkTargeting()), "Split is already targeting the splitting dimension.");
return split.getAssetsConfig().map(assetsConfig -> splitAssetsDirectories(assetsConfig, split)).orElse(ImmutableList.of(split)).stream().map(moduleSplit -> moduleSplit.isMasterSplit() ? moduleSplit : removeAssetsTargeting(moduleSplit)).collect(toImmutableList());
}
private ModuleSplit removeAssetsTargeting(ModuleSplit split) {
return targetingDimensionToRemove.isPresent() ? SuffixStripper.createForDimension(targetingDimensionToRemove.get()).removeAssetsTargeting(split) : split;
}
private ImmutableList<ModuleSplit> splitAssetsDirectories(Assets assets, ModuleSplit split) {
Multimap<T, TargetedAssetsDirectory> directoriesMap = Multimaps.filterKeys(Multimaps.index(assets.getDirectoryList(), targetedDirectory -> dimensionGetter.apply(targetedDirectory.getTargeting())), not(this::isDefaultTargeting));
ImmutableList.Builder<ModuleSplit> splitsBuilder = new ImmutableList.Builder<>();
// Generate config splits.
directoriesMap.asMap().entrySet().forEach(entry -> {
ImmutableList<ModuleEntry> entries = listEntriesFromDirectories(entry.getValue(), split);
if (entries.isEmpty()) {
return;
}
ModuleSplit.Builder modifiedSplit = split.toBuilder();
modifiedSplit.setEntries(entries).setApkTargeting(generateTargeting(split.getApkTargeting(), entry.getKey())).setMasterSplit(false).addMasterManifestMutator(withSplitsRequired(true));
splitsBuilder.add(modifiedSplit.build());
});
// Ensure that master split (even an empty one) always exists.
ModuleSplit defaultSplit = getDefaultAssetsSplit(split, splitsBuilder.build());
if (defaultSplit.isMasterSplit() || !defaultSplit.getEntries().isEmpty()) {
splitsBuilder.add(defaultSplit);
}
return splitsBuilder.build();
}
private ModuleSplit getDefaultAssetsSplit(ModuleSplit inputSplit, ImmutableList<ModuleSplit> configSplits) {
ImmutableSet<ModuleEntry> claimedEntries = configSplits.stream().map(ModuleSplit::getEntries).flatMap(Collection::stream).collect(toImmutableSet());
return inputSplit.toBuilder().setEntries(inputSplit.getEntries().stream().filter(not(claimedEntries::contains)).collect(toImmutableList())).build();
}
private boolean isDefaultTargeting(T splittingDimensionTargeting) {
return splittingDimensionTargeting.equals(splittingDimensionTargeting.getDefaultInstanceForType());
}
private ApkTargeting generateTargeting(ApkTargeting splitTargeting, T extraTargeting) {
if (isDefaultTargeting(extraTargeting)) {
return splitTargeting;
}
return splitTargeting.toBuilder().mergeFrom(targetingSetter.apply(extraTargeting)).build();
}
private ImmutableList<ModuleEntry> listEntriesFromDirectories(Collection<TargetedAssetsDirectory> directories, ModuleSplit moduleSplit) {
return directories.stream().map(targetedAssetsDirectory -> ZipPath.create(targetedAssetsDirectory.getPath())).flatMap(moduleSplit::getEntriesInDirectory).collect(toImmutableList());
}
};
}
use of com.android.bundle.Targeting.ApkTargeting in project bundletool by google.
the class TargetingUtilsTest method apkMultiAbiTargeting_byMultiAbiTargeting.
@Test
public void apkMultiAbiTargeting_byMultiAbiTargeting() {
ApkTargeting expectedTargeting = ApkTargeting.newBuilder().setMultiAbiTargeting(MULTI_ABI_WITH_ALTERNATIVES).build();
assertThat(TargetingUtils.apkMultiAbiTargeting(MULTI_ABI_WITH_ALTERNATIVES)).ignoringRepeatedFieldOrder().isEqualTo(expectedTargeting);
}
Aggregations