commit c3d5d9177b22f784b3a23309f07dc6cbd37e901b
author Ian Coolidge <icoolidge@google.com> Tue Mar 07 14:21:28 2017 -0800
committer chrome-bot <chrome-bot@chromium.org> Wed Mar 08 22:27:41 2017 -0800
tree 8d63bccc38bc93767bc83be2163182aebc5bcefa
parent 65b7c2567c2c37cedb86bac96f81316ff06ae3f0

update_kernel.sh: Learn partition layout from target

Don't depend on chromeos-common.sh or disk_layout_util.sh
for these constants, since they are going away.
Instead, learn them from the target.

BUG=b:35045101
TEST=`update_kernel`

Change-Id: I8ad6e73ab08a0b7baf5f66f8bed89e0e25742a5c
Reviewed-on: https://chromium-review.googlesource.com/451543
Commit-Ready: Ian Coolidge <icoolidge@google.com>
Tested-by: Ian Coolidge <icoolidge@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

update_kernel.sh

diff --git a/update_kernel.sh b/update_kernel.sh
index d4d5465..e55e440 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -9,8 +9,6 @@
 SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 . "${SCRIPT_ROOT}/remote_access.sh" || exit 1
-# This file is sourced for partition constants.
-. "${BUILD_LIBRARY_DIR}/disk_layout_util.sh" || exit 1
 
 # Script must be run inside the chroot.
 restart_in_chroot_if_needed "$@"
@@ -192,6 +190,8 @@
 
   learn_device
 
+  learn_partition_layout
+
   learn_partition_and_ro
 
   remote_sh uname -r -v