use of com.android.bundle.Files.Assets in project bundletool by google.
the class TargetingGeneratorTest method generateTargetingForAssets_nameOverloading_works.
@Test
public void generateTargetingForAssets_nameOverloading_works() throws Exception {
Assets assetsConfig = new TargetingGenerator().generateTargetingForAssets(ImmutableList.of(ZipPath.create("assets/world/texture#tcf_etc1/i18n#lang_en"), ZipPath.create("assets/world/texture#tcf_etc1/i18n#lang_ru")));
assertThat(assetsConfig).ignoringRepeatedFieldOrder().isEqualTo(Assets.newBuilder().addDirectory(TargetedAssetsDirectory.newBuilder().setPath("assets/world/texture#tcf_etc1/i18n#lang_en").setTargeting(mergeAssetsTargeting(assetsDirectoryTargeting(textureCompressionTargeting(TextureCompressionFormatAlias.ETC1_RGB8)), assetsDirectoryTargeting(languageTargeting("en"))))).addDirectory(TargetedAssetsDirectory.newBuilder().setPath("assets/world/texture#tcf_etc1/i18n#lang_ru").setTargeting(mergeAssetsTargeting(assetsDirectoryTargeting(textureCompressionTargeting(TextureCompressionFormatAlias.ETC1_RGB8)), assetsDirectoryTargeting(languageTargeting("ru"))))).build());
}
use of com.android.bundle.Files.Assets 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.Files.Assets in project bundletool by google.
the class AssetsTargetingValidatorTest method validateModule_assetModuleLanguageTargeting_throws.
@Test
public void validateModule_assetModuleLanguageTargeting_throws() throws Exception {
Assets config = assets(targetedAssetsDirectory("assets/dir#lang_en", assetsDirectoryTargeting(languageTargeting("en"))));
BundleModule module = new BundleModuleBuilder("testModule").addFile("assets/dir#lang_en/raw.dat").setAssetsConfig(config).setManifest(androidManifestForAssetModule("com.test.app")).build();
InvalidBundleException e = assertThrows(InvalidBundleException.class, () -> new AssetsTargetingValidator().validateModule(module));
assertThat(e).hasMessageThat().contains("Language targeting for asset packs is not supported, but found in module testModule.");
}
use of com.android.bundle.Files.Assets in project bundletool by google.
the class AssetsTargetingValidatorTest method validateModule_pathOutsideAssets_throws.
@Test
public void validateModule_pathOutsideAssets_throws() throws Exception {
Assets config = assets(targetedAssetsDirectory("lib/x86", assetsDirectoryTargeting(abiTargeting(X86))), targetedAssetsDirectory("assets/dir#tcf_etc1", assetsDirectoryTargeting(textureCompressionTargeting(TextureCompressionFormatAlias.ETC1_RGB8))));
BundleModule module = new BundleModuleBuilder("testModule").setAssetsConfig(config).addFile("assets/dir#tcf_etc1/file.txt").setManifest(androidManifest("com.test.app")).build();
InvalidBundleException e = assertThrows(InvalidBundleException.class, () -> new AssetsTargetingValidator().validateModule(module));
assertThat(e).hasMessageThat().contains("directory must start with 'assets/'");
}
use of com.android.bundle.Files.Assets in project bundletool by google.
the class AssetsTargetingValidatorTest method validateModule_defaultInstanceOfLanguageTargeting_throws.
@Test
public void validateModule_defaultInstanceOfLanguageTargeting_throws() throws Exception {
Assets config = assets(targetedAssetsDirectory("assets/dir", AssetsDirectoryTargeting.newBuilder().setLanguage(LanguageTargeting.getDefaultInstance()).build()));
BundleModule module = new BundleModuleBuilder("testModule").addFile("assets/dir/raw.dat").setAssetsConfig(config).setManifest(androidManifestForAssetModule("com.test.app")).build();
InvalidBundleException e = assertThrows(InvalidBundleException.class, () -> new AssetsTargetingValidator().validateModule(module));
assertThat(e).hasMessageThat().contains("set but empty language targeting");
}
Aggregations