Snap for 7883892 from 98c583c951356f2f1f540ce2e056e0ad73a33911 to sc-v2-release
Change-Id: If52fdf1d89d16238024d597e49c4d9c9a4f3566b
diff --git a/avb/Android.bp b/avb/Android.bp
index a65ebd4..bc8dbc7 100644
--- a/avb/Android.bp
+++ b/avb/Android.bp
@@ -49,6 +49,7 @@
":q-gsi_avbpubkey",
":r-gsi_avbpubkey",
":s-gsi_avbpubkey",
+ ":t-gsi_avbpubkey",
":qcar-gsi_avbpubkey",
],
}
diff --git a/avb/VtsSecurityAvbTest.cpp b/avb/VtsSecurityAvbTest.cpp
index de7bf5d..98b9e57 100644
--- a/avb/VtsSecurityAvbTest.cpp
+++ b/avb/VtsSecurityAvbTest.cpp
@@ -388,7 +388,8 @@
std::string allowed_key_blob;
std::vector<std::string> allowed_key_paths = {
"/data/local/tmp/q-gsi.avbpubkey", "/data/local/tmp/r-gsi.avbpubkey",
- "/data/local/tmp/s-gsi.avbpubkey", "/data/local/tmp/qcar-gsi.avbpubkey"};
+ "/data/local/tmp/s-gsi.avbpubkey", "/data/local/tmp/t-gsi.avbpubkey",
+ "/data/local/tmp/qcar-gsi.avbpubkey"};
for (const auto &path : allowed_key_paths) {
if (android::base::ReadFileToString(path, &allowed_key_blob)) {
if (key_blob_to_validate == allowed_key_blob) {
diff --git a/avb/data/Android.bp b/avb/data/Android.bp
new file mode 100644
index 0000000..1e3b76d
--- /dev/null
+++ b/avb/data/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+filegroup {
+ name: "t-gsi_avbpubkey",
+ srcs: [
+ "t-gsi.avbpubkey",
+ ],
+}
diff --git a/avb/data/t-gsi.avbpubkey b/avb/data/t-gsi.avbpubkey
new file mode 100644
index 0000000..de5991e
--- /dev/null
+++ b/avb/data/t-gsi.avbpubkey
Binary files differ
diff --git a/avb/vts_security_avb_test.xml b/avb/vts_security_avb_test.xml
index b03303f..d830f24 100644
--- a/avb/vts_security_avb_test.xml
+++ b/avb/vts_security_avb_test.xml
@@ -21,6 +21,7 @@
<option name="push" value="q-gsi.avbpubkey->/data/local/tmp/q-gsi.avbpubkey" />
<option name="push" value="r-gsi.avbpubkey->/data/local/tmp/r-gsi.avbpubkey" />
<option name="push" value="s-gsi.avbpubkey->/data/local/tmp/s-gsi.avbpubkey" />
+ <option name="push" value="t-gsi.avbpubkey->/data/local/tmp/t-gsi.avbpubkey" />
<option name="push" value="qcar-gsi.avbpubkey->/data/local/tmp/qcar-gsi.avbpubkey" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >