use of com.android.tools.build.bundletool.model.ModuleEntry in project bundletool by google.
the class ZipFlingerAppBundleSerializer method addNewEntries.
/**
* Adds new and modified entries to an archive, compressing them.
*/
private static void addNewEntries(ZipArchive archive, ImmutableListMultimap<BundleModule, ModuleEntry> entries) throws IOException {
for (Map.Entry<BundleModule, ModuleEntry> moduleAndEntry : entries.entries()) {
BundleModule module = moduleAndEntry.getKey();
ModuleEntry moduleEntry = moduleAndEntry.getValue();
checkState(!moduleEntry.getBundleLocation().isPresent());
ZipPath moduleDir = ZipPath.create(module.getName().toString());
ZipPath destPath = moduleDir.resolve(moduleEntry.getPath());
archive.add(new BytesSource(moduleEntry.getContent().read(), destPath.toString(), DEFAULT_COMPRESSION_LEVEL));
}
}
use of com.android.tools.build.bundletool.model.ModuleEntry in project bundletool by google.
the class BundleModuleMerger method getAllEntriesExceptDexAndSpecial.
private static ImmutableSet<ModuleEntry> getAllEntriesExceptDexAndSpecial(Set<BundleModule> bundleModulesToFuse) {
Map<ZipPath, ModuleEntry> mergedEntriesByPath = new HashMap<>();
bundleModulesToFuse.stream().flatMap(module -> module.getEntries().stream()).filter(moduleEntry -> !moduleEntry.getPath().startsWith(DEX_DIRECTORY) && !moduleEntry.isSpecialEntry()).forEach(moduleEntry -> {
ModuleEntry existingModuleEntry = mergedEntriesByPath.putIfAbsent(moduleEntry.getPath(), moduleEntry);
if (existingModuleEntry != null && !existingModuleEntry.equals(moduleEntry)) {
throw InvalidBundleException.builder().withUserMessage("Existing module entry '%s' with different contents.", moduleEntry.getPath()).build();
}
});
return ImmutableSet.copyOf(mergedEntriesByPath.values());
}
use of com.android.tools.build.bundletool.model.ModuleEntry in project bundletool by google.
the class AbiApexImagesSplitter method split.
/**
* Generates {@link ModuleSplit} objects dividing the APEX images by ABI.
*/
@Override
public ImmutableCollection<ModuleSplit> split(ModuleSplit moduleSplit) {
if (!moduleSplit.isApex()) {
return ImmutableList.of(moduleSplit);
}
List<TargetedApexImage> allTargetedImages = moduleSplit.getApexConfig().get().getImageList();
// A set of all MultiAbis (flattened for repeated values) for easy generation of alternatives.
ImmutableSet<MultiAbi> allTargeting = allTargetedImages.stream().flatMap(image -> image.getTargeting().getMultiAbi().getValueList().stream()).collect(toImmutableSet());
// This prevents O(n^2).
ImmutableMap<String, ModuleEntry> apexPathToEntryMap = buildApexPathToEntryMap(allTargetedImages, moduleSplit);
ImmutableList.Builder<ModuleSplit> splits = new ImmutableList.Builder<>();
for (TargetedApexImage targetedApexImage : allTargetedImages) {
ModuleEntry entry = apexPathToEntryMap.get(targetedApexImage.getPath());
List<MultiAbi> targeting = targetedApexImage.getTargeting().getMultiAbi().getValueList();
ModuleSplit.Builder splitBuilder = moduleSplit.toBuilder().setApkTargeting(moduleSplit.getApkTargeting().toBuilder().setMultiAbiTargeting(MultiAbiTargeting.newBuilder().addAllValue(targeting).addAllAlternatives(Sets.difference(allTargeting, ImmutableSet.copyOf(targeting)))).build()).setMasterSplit(false).setEntries(targetedApexImage.getBuildInfoPath().isEmpty() ? ImmutableList.of(entry) : ImmutableList.of(entry, apexPathToEntryMap.get(targetedApexImage.getBuildInfoPath())));
splits.add(splitBuilder.build());
}
return splits.build();
}
use of com.android.tools.build.bundletool.model.ModuleEntry 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.tools.build.bundletool.model.ModuleEntry in project bundletool by google.
the class EntryClashValidator method checkEqualEntries.
private static void checkEqualEntries(ZipPath path, BundleModule module1, BundleModule module2) {
ModuleEntry entry1 = module1.getEntry(path).get();
ModuleEntry entry2 = module2.getEntry(path).get();
if (!entry1.equals(entry2)) {
throw InvalidBundleException.builder().withUserMessage("Modules '%s' and '%s' contain entry '%s' with different content.", module1.getName(), module2.getName(), path).build();
}
}
Aggregations