From b697d47eb38b2dcfa545dfddb163927fc7f56900 Mon Sep 17 00:00:00 2001
From: Bowgo Tsai <bowgotsai@google.com>
Date: Wed, 19 Feb 2020 16:21:04 +0800
Subject: [PATCH] Adding new GSI public keys

Adding two new public keys for R-Developer-GSI and S-Developer-GSI,
respectively.

Bug: 149805495
Test: m r-developer-gsi.avbpubkey
Test: m s-developer-gsi.avbpubkey
Change-Id: Iaa7521ef40b94f13fe3c9c61d276678f47c60b98
---
 rootdir/avb/Android.mk                |  30 ++++++++++++++++++++++++++
 rootdir/avb/r-developer-gsi.avbpubkey | Bin 0 -> 1032 bytes
 rootdir/avb/s-developer-gsi.avbpubkey | Bin 0 -> 1032 bytes
 3 files changed, 30 insertions(+)
 create mode 100644 rootdir/avb/r-developer-gsi.avbpubkey
 create mode 100644 rootdir/avb/s-developer-gsi.avbpubkey

diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk
index 80573fb37..f96ffddb3 100644
--- a/rootdir/avb/Android.mk
+++ b/rootdir/avb/Android.mk
@@ -45,6 +45,21 @@ endif
 
 include $(BUILD_PREBUILT)
 
+#######################################
+# r-developer-gsi.avbpubkey
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := r-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)
+
 #######################################
 # s-gsi.avbpubkey
 include $(CLEAR_VARS)
@@ -59,3 +74,18 @@ LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb
 endif
 
 include $(BUILD_PREBUILT)
+
+#######################################
+# s-developer-gsi.avbpubkey
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := s-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)
diff --git a/rootdir/avb/r-developer-gsi.avbpubkey b/rootdir/avb/r-developer-gsi.avbpubkey
new file mode 100644
index 0000000000000000000000000000000000000000..aac39cc867c4890046c65377375ceb936ac12e78
GIT binary patch
literal 1032
zcmV+j1o!&@01yCXhCEHqKxciZzoFGzrObG}?E%`1F@KjsUt!j?@MMCh%meeVZFI;T
zyqJg)dn04N@Ad3gcw=?ocxk&^CvW9t#?s5%In<STPU#^}WA378G?C%sU2e~OyN`Sv
zcM1SU$wQ{fdJ^_pTz-3i1lqA%jRmPE!|xN&cDi?bfh?a0wOG*Uyh8ZbT!de(0xSYd
z;EUlyfY&cIOwTnsuo8QT2ErfLM`VCzzAcW7W0aE_?KgEbz4mkHp0{J-*yYfDJ9u1A
zjp|cOpg#d~!dVfO;m^YDHSKa}jQoE!dOdwtMrZ<|b=v&Y`udRdZY{_V7Hv|KU#_IP
zjL(HwZgv-9E^Rqy4GsR6HB}fK&t)(Qir>Ce&j2AVTT(;|dO+inO}W?FP!F=e`kcUY
zd24A&gcrbvWGikQnFA>{bQvjf%Y|sG3czJb!Q)m{sppEnIuC{^=K6rg?5*v8&f@be
z0Kf<u?H;j~B^Oc~Wm0`}Ylsh<)cCb5u<bBE6yK!51K^9$z;98eMO&^H2_4hs{2AWD
zB$dw@<l9LV7QvFbx~n7=vX+r^xOF#NFKeCHYYY$*kz%5;DNUd*NK$x<RS4Ojg5P?{
z4kSm$FLP>0X`q-1ME}*%VUO4Ib*#s=8n!Si-tyHhpu}<a`AFx<IhH^yx`O+2f|p5N
z^SjyijH7!U{|Y#z-az>#7l_w5j#|l#Y*7zoZ&;iW-EjkS;~1Xs<IH^!^HLCX_YU0v
zuPDbfFD{l%4h**LcUL1lgH;qAW%AE+5EtJxGIY%Om{4hPzc{<s`Vt4<g)C*2#M@j}
z!0dQ(!}tb$s9oC^o5lgXRA5hEMaLd^xjXL+-x$)ORJ2wFW^8yJ_pnLNC$a9sd5wxS
zzfqq%vc_U`Zz8E3d3jzW$d=?n0P`onYEZh$`qvWZ5sMS%V?#PgSkJ}T!t9I!!b%|R
zVR=^U^k=@O+YDT2NH81jNW}LjA1|eF25|Qlu6XAw0&ZX$gU%C42C=_uRc?!jxWAtZ
z)5Xqyh6$dK1}Kg5ugO|Kff<B?9qs-@7J8(`N<d{b#LHV60Dp?<291|cyuXmkJ)0hX
zfRtlCiq6C^da8ct;!F{1niDuBfe2(}ttOrIJm7r{Xr=eR>FdDD3%vFH>=Z7#lMmg4
z3$!AloHcR>L0NT`GqDY+0-m-@7Fy#1+6~Eo-*GC=k=>?d#ml@XxGc%N1$RkO@*H6$
z@loW!tx)E9)z{ZvgdpN^B1d=G$e{KgfE+0R=OuT<$#3&V!c-<MXA2aP-t<KcbjQK@
z&7u2+bLKMa9>KHms8B3U@+5$55jfT!`^09S+Pbp=ansMZmRklEd*#V3eIx#S-p3?+
CQvS#Q

literal 0
HcmV?d00001

diff --git a/rootdir/avb/s-developer-gsi.avbpubkey b/rootdir/avb/s-developer-gsi.avbpubkey
new file mode 100644
index 0000000000000000000000000000000000000000..f0a6c11b823a7579cf244582bcf65a08908bf867
GIT binary patch
literal 1032
zcmV+j1o!&@01yEFQG(I9%{ZvZL?Dr?g@YBpNZU%Wep3Glu8{%c^5de?;&ev51&m8~
zR{vmQoT=XQA&U@}K{J)K|8vzc23L*-&$2g;ACL7VnESwPhwIkjSk)_5EjxqmPM1q0
zVE;UT!Dw&n6Xr_m?#A}d8-E)s)R#kO18Dh*Hv~((B^9{Ou;vBe5;d)l%ZmeT97j_M
zOx?8<B|n5Ir$zpDvE)jy+AbLe1&~WWb!3|-ux+|3+d#z>YjXPi@t>(3UVNIxj`WsA
zw-gxulRN^h-(WC70%qtKY3uYrb>PUT{wd;<Z9&|KW{csLk(){W?=a=jwkaV+MyFI3
zf4ffe`%=l9&Xi+1+6G9S3d4}?H~f_4B0w!$(tXF_7F~IE@|bTLZeA+d9vEq#S%CeF
zjeSm*P;)m()0}`{go;9j;Q%p;e-nyU-2o4l;4_q;1V6fx?NR&rNtKVd8J~(08DzrI
z*lV)1097j$Od!ZChHc?hsjht_IUx8Znf})}d*ZAWV|O*`u~V{_dubw{eVSMm@Z!T)
zbfeSt=nvhJ2EqxC=HwocyBU*l=sD9|@_W5i?Bzar+(YwXp(FI&ktC%apGSOz^4SVV
zut%^qAQ+k}&4&Em`4q`Qyo9Q{$_!49BNU_=RICs=XWG%kqv3Yi$s_hcrwpJNO4EiA
zUrtE}SLx4?&x4`_!0CPxUTQ`*(@@_iI_Xggy0w@e0U^>78eDFdunM@aM$e5tC$4>(
zBHh}TZLN_Zy4TA8?SlQMLtniVN?i^uv&CMg^qy;2&}F+Y5kOQhzgiOJ87y)v>Q~FO
zPN{(&y7y{6d00Ylt=~{9krZfuD^cvVLL4C}y8`EZCxdRHURvKPS))AUED<dg2e>p3
z!^*;u5i?fPie=rF(^A_WTl_hWsSl-AbZY?u`zn`w?NFWmidX2jh82${gTF5e*FE^7
zilDNz#pxWB+J-(mat<tg%xG(tuZ_ZV;J%<dCzc2jJ1GV`6l(nqRI%zRj1U9*lJHeK
zvWATLb-Mk4)>V4`CIxCv$3z*oLl^Rul~v{sm^uWI4UeI6%j|8QZ~sy5q75Fg+)$)s
z6Pl6SO=Pfg^d^Urx>069gh**CA70v=$|;y<{w9s?*|M`Zi`aTh<8)sw4rPi*9mntY
z3wKf-vYBuyH31n+X9MYBAyQWG2e?h>eTAE}mOAGbIdaJnD64kJEcy6WxNoNl9mwp;
z5@&;o{5Ej(w~+Y(X?KQc1_#@?mnD~o9lwphdj<gWc51dKyb&s-Ck$KkH;v+DNe-|X
zDDEiF5v42q@H{CzR)R`D5Pw=WZF9PG>+(ikQ#sg37+EsP5moq{Uq<r&LmzKVQq>0W
CTl72t

literal 0
HcmV?d00001