Skip to content

Add bundletool version check when adding transparency file #367

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

Open
littledog623 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

Add bundletool version check when adding transparency file #367

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
8 changes: 7 additions & 1 deletion src/main/java/com/android/tools/build/bundletool/transparency/CodeTransparencyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.android.tools.build.bundletool.model.BundleModule;
import com.android.tools.build.bundletool.model.ModuleEntry;
import com.android.tools.build.bundletool.model.exceptions.InvalidBundleException;
import com.android.tools.build.bundletool.model.version.BundleToolVersion;
import com.google.common.collect.ImmutableList;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteSource;
Expand All @@ -51,8 +52,13 @@ public static CodeTransparency createCodeTransparencyMetadata(AppBundle bundle)
CodeTransparency.newBuilder()
.setVersion(CodeTransparencyVersion.getCurrentVersion())
.addAllCodeRelatedFile(codeRelatedFiles);

if (bundle.getStoreArchive().orElse(true)) {
if (BundleToolVersion.getCurrentVersion().compareTo(bundle.getVersion()) <= 0) {
throw InvalidBundleException.builder()
.withUserMessage("This bundletool version is lower than the one that is used to build the app bundle. " +
"Please use a bundletool with version >= " + bundle.getVersion())
.build();
}
codeTransparencyBuilder.addCodeRelatedFile(createArchivedCodeRelatedFile(bundle));
}

Expand Down