summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBowgo Tsai <bowgotsai@google.com>2019-03-28 22:58:40 +0800
committerBowgo Tsai <bowgotsai@google.com>2019-03-30 03:07:31 +0000
commit5fdd7861bb68206f28be40c8ec761d560bb8aa52 (patch)
treef0b9a36d2e40647d914ff5e882226d7934ac4b00
parent0a887aa14c5bd187859c7558259df3901fee2342 (diff)
downloadsystem_core-5fdd7861bb68206f28be40c8ec761d560bb8aa52.tar.gz
system_core-5fdd7861bb68206f28be40c8ec761d560bb8aa52.tar.bz2
system_core-5fdd7861bb68206f28be40c8ec761d560bb8aa52.zip
Adding GSI public keys
This CL adds three GSI keys, to allow booting a GSI with AVB to enable dm-verity. https://android.googlesource.com/platform/external/avb/ The keys for R and S GSI is to allow a device boots a new version of GSI in a Treble-compatible manner. For more information about GSI, please visit: https://source.android.com/setup/build/gsi Bug: 112293933 Test: m q-gsi.avbpubkey r-gsi.avbpubkey s-gsi.avbpubkey Change-Id: I4439e44fbd5da3240d7f6c7987f66445ec4590c5
-rw-r--r--rootdir/Android.mk2
-rw-r--r--rootdir/avb/Android.mk46
-rw-r--r--rootdir/avb/q-gsi.avbpubkeybin0 -> 1032 bytes
-rw-r--r--rootdir/avb/r-gsi.avbpubkeybin0 -> 1032 bytes
-rw-r--r--rootdir/avb/s-gsi.avbpubkeybin0 -> 1032 bytes
5 files changed, 48 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index f78a92680..5d307b859 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -376,3 +376,5 @@ $(LOCAL_BUILT_MODULE):
$(hide) echo -n > $@
$(hide) $(foreach lib,$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \
echo $(lib).so >> $@;)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk
new file mode 100644
index 000000000..5dc019ca2
--- /dev/null
+++ b/rootdir/avb/Android.mk
@@ -0,0 +1,46 @@
+LOCAL_PATH:= $(call my-dir)
+
+#######################################
+# q-gsi.avbpubkey
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := q-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)
+
+#######################################
+# r-gsi.avbpubkey
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := r-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)
+
+#######################################
+# s-gsi.avbpubkey
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := s-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)
diff --git a/rootdir/avb/q-gsi.avbpubkey b/rootdir/avb/q-gsi.avbpubkey
new file mode 100644
index 000000000..5ed7543ba
--- /dev/null
+++ b/rootdir/avb/q-gsi.avbpubkey
Binary files differ
diff --git a/rootdir/avb/r-gsi.avbpubkey b/rootdir/avb/r-gsi.avbpubkey
new file mode 100644
index 000000000..2609b3037
--- /dev/null
+++ b/rootdir/avb/r-gsi.avbpubkey
Binary files differ
diff --git a/rootdir/avb/s-gsi.avbpubkey b/rootdir/avb/s-gsi.avbpubkey
new file mode 100644
index 000000000..9065fb83f
--- /dev/null
+++ b/rootdir/avb/s-gsi.avbpubkey
Binary files differ