Don't install HWID directly into the image.
This will be done by the factory installation process instead.
BUG=chrome-os-partner:24798
TEST=cbuildbot
CQ-DEPEND=CL:189785, CL:189777, CL:*157056
Change-Id: Idf58522490033e96506d9b0b535e549f3c33da43
Reviewed-on: https://chromium-review.googlesource.com/189777
Tested-by: Jon Salz <jsalz@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Vic Yang <victoryang@chromium.org>
diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index 0103758..dcbc6e0 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -17,22 +17,6 @@
emerge_to_image --root="${root_dev_dir}" chromeos-test
}
-prepare_hwid_for_factory() {
- local hwid_dest="$1/hwid"
- local hwid_src="${BOARD_ROOT}/usr/share/chromeos-hwid"
-
- # Force refreshing source folder in build root folder
- sudo rm -rf "${hwid_src}" "${hwid_dest}"
- emerge_to_image chromeos-hwid
- if [ -d "${hwid_src}" ]; then
- # TODO(hungte) After being archived by chromite, the HWID files will be in
- # factory_test/hwid; we should move it to top level folder.
- cp -r "${hwid_src}" "${hwid_dest}"
- else
- echo "Skipping HWID: No HWID bundles found."
- fi
-}
-
# Converts a dev image into a test or factory test image
# Takes as an arg the name of the image to be created.
mod_image_for_test () {
@@ -68,8 +52,6 @@
chromeos-base/autotest-factory-install \
chromeos-base/chromeos-factory
- prepare_hwid_for_factory "${BUILD_DIR}"
-
echo "Modifying Release Description for Factory."
sudo sed -i 's/Test/Factory/' "${root_fs_dir}/etc/lsb-release"
fi
