Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99651b01 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Allowing R and S developer GSI for DSU 

Adding new keys to allow a device boot a R-Deverloper-GSI and
S-Developer-GSI, respectively.

Also removing previous keys for R-Compliance-GSI and
S-Compliance-GSI, respectively. We will be allowing CTS-on-GSI
to run on unlocked state in R and later releases.

  https://android-review.googlesource.com/c/platform/test/suite_harness/+/1228453

Bug: 149805495
Test: boot a device
Change-Id: I000365d0b407605b426c4695c6ac614150ee9b13
Merged-In: I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb
parent 14b8c451

fs_mgr/fs_mgr_fstab.cpp

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ FstabEntry BuildGsiSystemFstabEntry() { 
                         // could add more keys separated by ':'.

                         .avb_keys =

                                 "/avb/q-gsi.avbpubkey:/avb/q-developer-gsi.avbpubkey:"

                                 "/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey",

                                 "/avb/r-developer-gsi.avbpubkey:/avb/s-developer-gsi.avbpubkey",

                         .logical_partition_name = "system"};

    system.fs_mgr_flags.wait = true;

    system.fs_mgr_flags.logical = true;