diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2018-05-31 10:16:46 +0800 |
|---|---|---|
| committer | Sandeep Patil <sspatil@google.com> | 2018-05-31 13:50:34 -0700 |
| commit | 1572f9b60ed2bedc16c2a534da9f8cb7cc512524 (patch) | |
| tree | cc0347c5ed7bfeae1f7fe29a079a4c822128aa1a | |
| parent | 664ff4f0169970479fda925a032e1d9538409a12 (diff) | |
| download | native-1572f9b60ed2bedc16c2a534da9f8cb7cc512524.tar.gz | |
Otadexopt: removing bootdevice from /dev/block/bootdevice/by-name/*
We should switch to use /dev/block/by-name/<partition> because there is
no requirement to have a single 'bootdevice' for Android. The symlink is
created in the following change:
https://android-review.googlesource.com/c/platform/system/core/+/674989
Bug: 80466341
Bug: 78613232
Test: m -j otapreopt_chroot
Test: Successful go/manual_ab_ota on walleye
Change-Id: I26fbf67e72cc2ee93909e95b0254ba1602e6ae8e
Merged-In: I26fbf67e72cc2ee93909e95b0254ba1602e6ae8e
(cherry picked from commit 19d2d08bfbc3840a93762011d6a2763bd37be05a)
| -rw-r--r-- | cmds/installd/otapreopt_chroot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp index 3ae56dba65..e90cf3bab2 100644 --- a/cmds/installd/otapreopt_chroot.cpp +++ b/cmds/installd/otapreopt_chroot.cpp @@ -115,7 +115,7 @@ static int otapreopt_chroot(const int argc, char **arg) { exit(207); } { - std::string vendor_partition = StringPrintf("/dev/block/bootdevice/by-name/vendor%s", + std::string vendor_partition = StringPrintf("/dev/block/by-name/vendor%s", arg[2]); int vendor_result = mount(vendor_partition.c_str(), "/postinstall/vendor", @@ -128,7 +128,7 @@ static int otapreopt_chroot(const int argc, char **arg) { // Try to mount the product partition. update_engine doesn't do this for us, but we // want it for product APKs. Same notes as vendor above. { - std::string product_partition = StringPrintf("/dev/block/bootdevice/by-name/product%s", + std::string product_partition = StringPrintf("/dev/block/by-name/product%s", arg[2]); int product_result = mount(product_partition.c_str(), "/postinstall/product", |