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

Commit 2d7f4193 authored by Luca Stefani's avatar Luca Stefani
Browse files

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
parents e24c57b3 204bd34e

fs_mgr/fs_mgr_fstab.cpp

+10 −9
Original line number Diff line number Diff line
@@ -814,14 +814,15 @@ std::set<std::string> GetBootDevices() { 


FstabEntry BuildGsiSystemFstabEntry() {

    // .logical_partition_name is required to look up AVB Hashtree descriptors.

    FstabEntry system = {

            .blk_device = "system_gsi",

    FstabEntry system = {.blk_device = "system_gsi",

                         .mount_point = "/system",

                         .fs_type = "ext4",

                         .flags = MS_RDONLY,

                         .fs_options = "barrier=1",

                         // could add more keys separated by ':'.

            .avb_keys = "/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey",

                         .avb_keys =

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

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

                         .logical_partition_name = "system"};

    system.fs_mgr_flags.wait = true;

    system.fs_mgr_flags.logical = true;

init/service.cpp

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ void Service::Reap(const siginfo_t& siginfo) { 
                    LOG(ERROR) << "updatable process '" << name_ << "' exited 4 times "

                               << (boot_completed ? "in 4 minutes" : "before boot completed");

                    // Notifies update_verifier and apexd

                    property_set("ro.init.updatable_crashing_process_name", name_);

                    property_set("ro.init.updatable_crashing", "1");

                }

            }

rootdir/avb/Android.mk

+15 −0
Original line number Diff line number Diff line
@@ -15,6 +15,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)

rootdir/avb/q-developer-gsi.avbpubkey

0 → 100644
+1.01 KiB

File added.

No diff preview for this file type.

View file