commit 857cfadcd367d7c0723f5928a32f62b588cd21e7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 22 05:07:18 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 22 05:07:18 2021 +0000
tree a7c668f046c66cd7403809c2f7bbb90e2a68abed
parent af37bcc3f65a012d93b6a59afa98576fcb864531
parent e32fe95d1d5d896c2945be9be681319f603de072

Merge "Snap for 8020074 from efcca342036b399c4defb094ac030e363a215aee to android11-tests-release" into android11-tests-release

rootdir/avb/Android.bp

diff --git a/rootdir/avb/Android.bp b/rootdir/avb/Android.bp
index 85d2786..8c7caf3 100644
--- a/rootdir/avb/Android.bp
+++ b/rootdir/avb/Android.bp
@@ -18,3 +18,10 @@
         "s-gsi.avbpubkey",
     ],
 }
+
+filegroup {
+    name: "qcar-gsi_avbpubkey",
+    srcs: [
+        "qcar-gsi.avbpubkey",
+    ],
+}

rootdir/avb/Android.mk

diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk
index f96ffdd..d4c3939 100644
--- a/rootdir/avb/Android.mk
+++ b/rootdir/avb/Android.mk
@@ -89,3 +89,17 @@
 endif
 
 include $(BUILD_PREBUILT)
+#######################################
+# qcar-gsi.avbpubkey
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := qcar-gsi.avbpubkey
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb
+else
+LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb
+endif
+
+include $(BUILD_PREBUILT)

rootdir/avb/qcar-gsi.avbpubkey

diff --git a/rootdir/avb/qcar-gsi.avbpubkey b/rootdir/avb/qcar-gsi.avbpubkey
new file mode 100644
index 0000000..ce56646
--- /dev/null
+++ b/rootdir/avb/qcar-gsi.avbpubkey
Binary files differ