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
diff --git a/compos/tests/Android.bp b/compos/tests/Android.bp
index 41958ca..511ecd0 100644
--- a/compos/tests/Android.bp
+++ b/compos/tests/Android.bp
@@ -19,7 +19,7 @@
// 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++",
diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index d8504f7..fe1c4f0 100644
--- a/compos/tests/java/android/compos/test/ComposTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposTestCase.java
@@ -186,13 +186,16 @@
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 {