diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-07 13:42:13 +0100 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-07 13:42:13 +0100 |
| commit | 2d7f4193a04ad9148cbe6cd3dd45dc961e22ff4e (patch) | |
| tree | 2771107b8aa8eff4a2145cfc42181638ec1666a8 /rootdir | |
| parent | e24c57b3c61a72ebd2a98d1f42b0891362138b20 (diff) | |
| parent | 204bd34e58de124ead5a1e65b852608620077b84 (diff) | |
| download | system_core-2d7f4193a04ad9148cbe6cd3dd45dc961e22ff4e.tar.gz system_core-2d7f4193a04ad9148cbe6cd3dd45dc961e22ff4e.tar.bz2 system_core-2d7f4193a04ad9148cbe6cd3dd45dc961e22ff4e.zip | |
Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31
Android 10.0.0 release 31
* tag 'android-10.0.0_r31':
Store crashing process name in sysprop
Allowing /avb/q-developer-gsi.avbpubkey for DSU
Adding the AVB public key for Q-Developer-GSI
FlattenableUtils::align memsets
Change-Id: Ia9d79894d1a390669031842f83c1bba3d185e9b2
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/avb/Android.mk | 15 | ||||
| -rw-r--r-- | rootdir/avb/q-developer-gsi.avbpubkey | bin | 0 -> 1032 bytes |
2 files changed, 15 insertions, 0 deletions
diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 5dc019ca2..80573fb37 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -16,6 +16,21 @@ endif include $(BUILD_PREBUILT) ####################################### +# q-developer-gsi.avbpubkey +include $(CLEAR_VARS) + +LOCAL_MODULE := q-developer-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) diff --git a/rootdir/avb/q-developer-gsi.avbpubkey b/rootdir/avb/q-developer-gsi.avbpubkey Binary files differnew file mode 100644 index 000000000..0ace69ddd --- /dev/null +++ b/rootdir/avb/q-developer-gsi.avbpubkey |