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

Commit 6069891e authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Rename product_services to system_ext" 

am: 5ffffb4f

Change-Id: I4bdddd6074461f1db7f6be85120ad5f32f45fbb3
parents 3c57b7f3 5ffffb4f

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -82,3 +82,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin/charger) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin/charger)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services.img)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/product_services)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/product_services)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/debug_ramdisk/product_services)

adb/client/commandline.cpp

+3 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void help() { 
        " pull [-a] REMOTE... LOCAL\n"

        "     copy files/dirs from device\n"

        "     -a: preserve file timestamp and mode\n"

        " sync [all|data|odm|oem|product_services|product|system|vendor]\n"

        " sync [all|data|odm|oem|product|system|system_ext|vendor]\n"

        "     sync a local build from $ANDROID_PRODUCT_OUT to the device (default all)\n"

        "     -l: list but don't copy\n"

        "\n"
@@ -1842,8 +1842,8 @@ int adb_commandline(int argc, const char** argv) { 
        }



        if (src.empty()) src = "all";

        std::vector<std::string> partitions{"data",   "odm",   "oem", "product", "product_services",

                                            "system", "vendor"};

        std::vector<std::string> partitions{"data",   "odm",        "oem",   "product",

                                            "system", "system_ext", "vendor"};

        bool found = false;

        for (const auto& partition : partitions) {

            if (src == "all" || src == partition) {

fastboot/fastboot.cpp

+4 −5
Original line number Diff line number Diff line
@@ -144,14 +144,13 @@ static Image images[] = { 
    { "dts",      "dt.img",           "dt.sig",       "dts",      true,  ImageType::BootCritical },

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

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

    { "product_services",

                  "product_services.img",

                                      "product_services.sig",

                                                      "product_services",

                                                                  true,  ImageType::Normal },

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

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

    { "system",   "system.img",       "system.sig",   "system",   false, ImageType::Normal },

    { "system_ext",

                  "system_ext.img",   "system_ext.sig",

                                                      "system_ext",

                                                                  true,  ImageType::Normal },

    { nullptr,    "system_other.img", "system.sig",   "system",   true,  ImageType::Normal },

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

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

rootdir/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -113,10 +113,10 @@ ifdef BOARD_USES_PRODUCTIMAGE 
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

ifdef BOARD_USES_SYSTEM_EXTIMAGE

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

else

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

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

endif

ifdef BOARD_USES_METADATA_PARTITION

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