Merge branch 'master' of ssh://chromiumos-git/chromeos

build_platform_packages.sh

@@ -29,7 +29,7 @@ PLATFORM_DIR="$SRC_ROOT/platform"
 PLATFORM_DIRS="acpi assets fake_hal init installer login_manager \
                memento_softwareupdate pam_google window_manager \
                cros chrome screenlocker cryptohome \
-               monitor_reconfig"
+               monitor_reconfig minijail"
 
 THIRD_PARTY_DIR="$SRC_ROOT/third_party"
 THIRD_PARTY_PACKAGES="connman e2fsprogs/files gflags gtest \

mod_image_for_test.sh

@@ -10,7 +10,9 @@
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
-DEFINE_string image "rootfs.image"    \
+IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images"
+DEFAULT_IMAGE="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)/rootfs.image"
+DEFINE_string image "$DEFAULT_IMAGE"    \
   "Location of the rootfs raw image file"
 
 # Parse command line
@@ -61,6 +63,8 @@ LOOP_DEV=`sudo losetup -f`
 sudo losetup "${LOOP_DEV}" "${FLAGS_image}"
 sudo mount "${LOOP_DEV}" "${ROOT_FS_DIR}"
 
+echo "Modifying image ${FLAGS_image} for test..."
+
 # Run build steps for modify for test
 sudo mkdir -p "${ROOT_FS_DIR}/modify_build"
 scripts_dir="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"