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

Commit c75044d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "system_dlkm_dynamic" 

* changes:
  system_dlkm: Fix flag for mount point guard
  system_dlkm: load property for dynamic partition
parents ed54a2f2 86175ef9

init/property_service.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,7 @@ void PropertyLoadBootDefaults() { 
    LoadPropertiesFromSecondStageRes(&properties);

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

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

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

    // TODO(b/117892318): uncomment the following condition when vendor.imgs for aosp_* targets are

    // all updated.

    // if (SelinuxGetVendorAndroidVersion() <= __ANDROID_API_R__) {

rootdir/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ endif 
ifdef BOARD_USES_METADATA_PARTITION

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

endif

ifdef BOARD_USES_SYSTEM_DLKM_PARTITION

ifdef BOARD_USES_SYSTEM_DLKMIMAGE

  # /system_dlkm mount point

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

endif