pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust for bcc_validator rename 

bcc_validator is now called hwtrust so update the references. The java
formatter makes the change look bigger than it is.

Test: atest ComposTestCase
Change-Id: Iaa75608af15ce365fdb9ce7a06ffb020bde5bd56
This commit is contained in:
Andrew Scull 2023-01-15 21:29:05 +00:00
parent 41eb7240a9
commit 00d5dbb1f3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compos/tests/Android.bp
View File

@ -19,7 +19,7 @@ java_test_host {
// java_test_host doesn't have data_native_libs but jni_libs can be used to put
// native modules under ./lib directory.
// This works because host tools have rpath (../lib and ./lib).
data_native_bins: ["bcc_validator"],
data_native_bins: ["hwtrust"],
jni_libs: [
"libcrypto",
"libc++",

15
compos/tests/java/android/compos/test/ComposTestCase.java
View File

@ -186,13 +186,16 @@ public final class ComposTestCase extends MicrodroidHostTestCaseBase {
new FileInputStreamSource(bcc_file));
// Find the validator binary - note that it's specified as a dependency in our Android.bp.
File validator = getTestInformation().getDependencyFile("bcc_validator", /*targetFirst=*/
false);
File validator = getTestInformation().getDependencyFile("hwtrust", /*targetFirst=*/ false);
CommandResult result = new RunUtil().runTimedCmd(10000,
validator.getAbsolutePath(), "verify-chain", bcc_file.getAbsolutePath());
assertWithMessage("bcc_validator failed").about(command_results())
.that(result).isSuccess();
CommandResult result =
new RunUtil()
.runTimedCmd(
10000,
validator.getAbsolutePath(),
"verify-dice-chain",
bcc_file.getAbsolutePath());
assertWithMessage("hwtrust failed").about(command_results()).that(result).isSuccess();
}
private CommandResult runOdrefresh(CommandRunner android, String command) throws Exception {