summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Freni2018-05-25 10:07:19 -0500
committerDario Freni2018-07-31 18:08:52 -0500
commitc7ea1afe90ac2524c7468caa9f5a0cb19d538560 (patch)
tree4524ae6411678799a9bf0a0ce86c155fd8f9ce1e
parentd5f825c78bc98027a485d8bdecd14e8563a449ba (diff)
downloadplatform-system-core-c7ea1afe90ac2524c7468caa9f5a0cb19d538560.tar.gz
platform-system-core-c7ea1afe90ac2524c7468caa9f5a0cb19d538560.tar.xz
platform-system-core-c7ea1afe90ac2524c7468caa9f5a0cb19d538560.zip
Add product-services.img for `fastboot flashall`.
This CL is largely and adaptation of Ifd119650dd3316508870df0dfc770099e95ae1d1 Bug: 80741439 Test: Successfully built product-services.img with one module in it, and flashed on device. Also successfully built image with /system/product-services and no dedicated /product-services partition. Change-Id: I204a831e052d018018ab124d70ad1ff1610ee007
-rw-r--r--fastboot/fastboot.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 263ea1780..c830321a8 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -114,20 +114,25 @@ static struct {
114 bool is_optional; 114 bool is_optional;
115 bool is_secondary; 115 bool is_secondary;
116} images[] = { 116} images[] = {
117 // clang-format off 117 // clang-format off
118 { "boot", "boot.img", "boot.sig", "boot", false, false }, 118 { "boot", "boot.img", "boot.sig", "boot", false, false },
119 { nullptr, "boot_other.img", "boot.sig", "boot", true, true }, 119 { nullptr, "boot_other.img", "boot.sig", "boot", true, true },
120 { "dtbo", "dtbo.img", "dtbo.sig", "dtbo", true, false }, 120 { "dtbo", "dtbo.img", "dtbo.sig", "dtbo", true, false },
121 { "dts", "dt.img", "dt.sig", "dts", true, false }, 121 { "dts", "dt.img", "dt.sig", "dts", true, false },
122 { "odm", "odm.img", "odm.sig", "odm", true, false }, 122 { "odm", "odm.img", "odm.sig", "odm", true, false },
123 { "product", "product.img", "product.sig", "product", true, false }, 123 { "product", "product.img", "product.sig", "product", true, false },
124 { "product-services",
125 "product-services.img",
126 "product-services.sig",
127 "product-services",
128 true, false },
124 { "recovery", "recovery.img", "recovery.sig", "recovery", true, false }, 129 { "recovery", "recovery.img", "recovery.sig", "recovery", true, false },
125 { "system", "system.img", "system.sig", "system", false, false }, 130 { "system", "system.img", "system.sig", "system", false, false },
126 { nullptr, "system_other.img", "system.sig", "system", true, true }, 131 { nullptr, "system_other.img", "system.sig", "system", true, true },
127 { "vbmeta", "vbmeta.img", "vbmeta.sig", "vbmeta", true, false }, 132 { "vbmeta", "vbmeta.img", "vbmeta.sig", "vbmeta", true, false },
128 { "vendor", "vendor.img", "vendor.sig", "vendor", true, false }, 133 { "vendor", "vendor.img", "vendor.sig", "vendor", true, false },
129 { nullptr, "vendor_other.img", "vendor.sig", "vendor", true, true }, 134 { nullptr, "vendor_other.img", "vendor.sig", "vendor", true, true },
130 // clang-format on 135 // clang-format on
131}; 136};
132 137
133static std::string find_item_given_name(const char* img_name) { 138static std::string find_item_given_name(const char* img_name) {