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

Commit de39afd1 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "s/product-services/product_services/g"

parents 59cd8237 ab5583b5

fastboot/fastboot.cpp

+3 −3
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ static struct { 
    { "dts",      "dt.img",           "dt.sig",       "dts",      true,  false },

    { "odm",      "odm.img",          "odm.sig",      "odm",      true,  false },

    { "product",  "product.img",      "product.sig",  "product",  true,  false },

    { "product-services",

                  "product-services.img",

                                      "product-services.sig",

    { "product_services",

                  "product_services.img",

                                      "product_services.sig",

                                                      "product_services",

                                                                  true,  true  },

    { "recovery", "recovery.img",     "recovery.sig", "recovery", true,  false },

init/init.cpp

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_ 
        if (!parser.ParseConfig("/product/etc/init")) {

            late_import_paths.emplace_back("/product/etc/init");

        }

        if (!parser.ParseConfig("/product-services/etc/init")) {

            late_import_paths.emplace_back("/product-services/etc/init");

        if (!parser.ParseConfig("/product_services/etc/init")) {

            late_import_paths.emplace_back("/product_services/etc/init");

        }

        if (!parser.ParseConfig("/odm/etc/init")) {

            late_import_paths.emplace_back("/odm/etc/init");

init/property_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ void property_load_boot_defaults() { 
        }

    }

    load_properties_from_file("/product/build.prop", NULL);

    load_properties_from_file("/product-services/build.prop", NULL);

    load_properties_from_file("/product_services/build.prop", NULL);

    load_properties_from_file("/odm/default.prop", NULL);

    load_properties_from_file("/vendor/default.prop", NULL);

libcutils/fs_config.cpp

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static const struct fs_path_config android_files[] = { 
    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_file + 1 },

    { 00600, AID_ROOT,      AID_ROOT,      0, "product/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "product-services/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "product_services/build.prop" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },

rootdir/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -94,9 +94,9 @@ else 
  LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product $(TARGET_ROOT_OUT)/product

endif

ifdef BOARD_USES_PRODUCT_SERVICESIMAGE

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

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

else

  LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product-services $(TARGET_ROOT_OUT)/product-services

  LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product_services $(TARGET_ROOT_OUT)/product_services

endif

ifdef BOARD_USES_METADATA_PARTITION

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