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

Commit 30b52007 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "odm_dlkm" am: 3e31ec83 am: 8c3a7ca9 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1363939

Change-Id: I8cdd4583c894d7fb5168fce1df789f2973a57357
parents b41ffef5 8c3a7ca9

fastboot/fastboot.bash

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ _fastboot_cmd_flash() { 


    cur="${COMP_WORDS[COMP_CWORD]}"

    if [[ $i -eq $COMP_CWORD ]]; then

        partitions="boot bootloader dtbo modem odm oem product radio recovery system vbmeta vendor vendor_dlkm"

        partitions="boot bootloader dtbo modem odm odm_dlkm oem product radio recovery system vbmeta vendor vendor_dlkm"

        COMPREPLY=( $(compgen -W "$partitions" -- $cur) )

    else

        _fastboot_util_complete_local_file "${cur}" '!*.img'

fastboot/fastboot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static Image images[] = { 
    { "dtbo",     "dtbo.img",         "dtbo.sig",     "dtbo",     true,  ImageType::BootCritical },

    { "dts",      "dt.img",           "dt.sig",       "dts",      true,  ImageType::BootCritical },

    { "odm",      "odm.img",          "odm.sig",      "odm",      true,  ImageType::Normal },

    { "odm_dlkm", "odm_dlkm.img",     "odm_dlkm.sig", "odm_dlkm", true,  ImageType::Normal },

    { "product",  "product.img",      "product.sig",  "product",  true,  ImageType::Normal },

    { "recovery", "recovery.img",     "recovery.sig", "recovery", true,  ImageType::BootCritical },

    { "super",    "super.img",        "super.sig",    "super",    true,  ImageType::Extra },

init/property_service.cpp

+3 −1
Original line number Diff line number Diff line
@@ -632,10 +632,11 @@ static void LoadProperties(char* data, const char* filter, const char* filename, 
    char *key, *value, *eol, *sol, *tmp, *fn;

    size_t flen = 0;



    static constexpr const char* const kVendorPathPrefixes[3] = {

    static constexpr const char* const kVendorPathPrefixes[4] = {

            "/vendor",

            "/odm",

            "/vendor_dlkm",

            "/odm_dlkm",

    };



    const char* context = kInitContext;
@@ -941,6 +942,7 @@ void PropertyLoadBootDefaults() { 
    // }

    load_properties_from_file("/vendor/build.prop", nullptr, &properties);

    load_properties_from_file("/vendor_dlkm/etc/build.prop", nullptr, &properties);

    load_properties_from_file("/odm_dlkm/etc/build.prop", nullptr, &properties);

    load_properties_from_partition("odm", /* support_legacy_path_until */ 28);

    load_properties_from_partition("product", /* support_legacy_path_until */ 30);

rootdir/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -131,6 +131,16 @@ LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/vendor_dlkm 
# via /vendor/lib/modules directly.

LOCAL_POST_INSTALL_CMD += ; ln -sf /vendor/vendor_dlkm/etc $(TARGET_ROOT_OUT)/vendor_dlkm/etc



# For /odm_dlkm partition.

LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/odm_dlkm

# For Treble Generic System Image (GSI), system-as-root GSI needs to work on

# both devices with and without /odm_dlkm partition. Those symlinks are for

# devices without /odm_dlkm partition. For devices with /odm_dlkm

# partition, mount odm_dlkm.img under /odm_dlkm will hide those symlinks.

# Note that /odm_dlkm/lib is omitted because odm DLKMs should be accessed

# via /odm/lib/modules directly.

LOCAL_POST_INSTALL_CMD += ; ln -sf /odm/odm_dlkm/etc $(TARGET_ROOT_OUT)/odm_dlkm/etc



ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE

  LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache

else