Update image URLs for device flashing scripts

Also, remove the bootloader section.
We can skip bootloaders for the old devices for which we know the
bootloaders are the correct version.

Change-Id: Icd283cd572c44df6cef78b1dcd8e4f154012c6d5

5 files changed, 14 insertions, 20 deletions

diff --git a/devices/flash_device.sh b/devices/flash_device.sh
index 74da7a7..3576116 100644
--- a/devices/flash_device.sh
+++ b/devices/flash_device.sh
@@ -61,7 +61,7 @@ argument_parser() {
 
 download_image() {
   log I "Downloading $1 to ${temp_dir} ... "
-  safe wget "${SNAPSHOTS_URL}/${BUILD_NO}/${BUILD_TARGET}/$1" -O "${temp_dir}/$1"
+  safe wget "${SNAPSHOTS_URL}/${BUILD_TARGET}/${BUILD_NO}/$1" -O "${temp_dir}/$1"
 }
 
 
diff --git a/devices/flash_nexus5x.sh b/devices/flash_nexus5x.sh
index a6156cb..0dd33a1 100755
--- a/devices/flash_nexus5x.sh
+++ b/devices/flash_nexus5x.sh
@@ -22,11 +22,9 @@ readonly local_path=$(dirname "$0")
 
 # NOTE: Only modify these variables; all the other changes should be applied to flash_device.sh.
 BOARD="bullhead"
-BUILD_NO="4"
-BUILD_TARGET="aosp_bullhead-userdebug"
-SNAPSHOTS_URL="http://snapshots.linaro.org/android/android-generic-build/"
-BOOTLOADER_IMAGE="bootloader-bullhead-bhz11f.img"
-RADIO_IMAGE="radio-bullhead-m8994f-2.6.33.2.14.img"
+BUILD_NO="17.06"
+BUILD_TARGET="bullhead"
+SNAPSHOTS_URL="http://releases-us.linaro.org/android/images/art"
 declare -A USERSPACE_IMAGES
 USERSPACE_IMAGES=([boot]="boot.img"
                   [system]="system.img"
diff --git a/devices/flash_nexus6p.sh b/devices/flash_nexus6p.sh
index b7c3339..6766f95 100755
--- a/devices/flash_nexus6p.sh
+++ b/devices/flash_nexus6p.sh
@@ -22,11 +22,9 @@ readonly local_path=$(dirname "$0")
 
 # NOTE: Only modify these variables; all the other changes should be applied to flash_device.sh.
 BOARD="angler"
-BUILD_NO="5"
-BUILD_TARGET="aosp_angler-userdebug"
-SNAPSHOTS_URL="http://snapshots.linaro.org/android/android-generic-build/"
-BOOTLOADER_IMAGE="bootloader-angler-angler-03.61.img"
-RADIO_IMAGE="radio-angler-angler-03.72.img"
+BUILD_NO="17.06"
+BUILD_TARGET="angler"
+SNAPSHOTS_URL="http://releases-us.linaro.org/android/images/art"
 declare -A USERSPACE_IMAGES
 USERSPACE_IMAGES=([boot]="boot.img"
                   [system]="system.img"
diff --git a/devices/flash_nexus9.sh b/devices/flash_nexus9.sh
index 286be71..b6145b2 100755
--- a/devices/flash_nexus9.sh
+++ b/devices/flash_nexus9.sh
@@ -22,14 +22,12 @@ readonly local_path=$(dirname "$0")
 
 # NOTE: Only modify these variables; all the other changes should be applied to flash_device.sh.
 BOARD="flounder"
-BUILD_NO="3"
-BUILD_TARGET="aosp_flounder-userdebug"
-SNAPSHOTS_URL="http://snapshots.linaro.org/android/android-generic-build/"
-BOOTLOADER_IMAGE="bootloader-flounder-3.48.0.0139.img"
+BUILD_NO="17.06"
+BUILD_TARGET="flounder"
+SNAPSHOTS_URL="http://releases-us.linaro.org/android/images/art"
 declare -A USERSPACE_IMAGES
 USERSPACE_IMAGES=([boot]="boot.img"
-                  [system]="system.img"
-                  [vendor]="vendor.img")
+                  [system]="system.img")
 
 # Call main script.
 source "${local_path}/flash_device.sh" "$@"
diff --git a/devices/flash_pixel.sh b/devices/flash_pixel.sh
index d562274..ef2493c 100755
--- a/devices/flash_pixel.sh
+++ b/devices/flash_pixel.sh
@@ -22,9 +22,9 @@ readonly local_path=$(dirname "$0")
 
 # NOTE: Only modify these variables; all the other changes should be applied to flash_device.sh.
 BOARD="sailfish"
-BUILD_NO="14"
-BUILD_TARGET="aosp_sailfish-userdebug"
-SNAPSHOTS_URL="http://snapshots.linaro.org/android/android-generic-build/"
+BUILD_NO="17.06"
+BUILD_TARGET="sailfish"
+SNAPSHOTS_URL="http://releases-us.linaro.org/android/images/art"
 declare -A USERSPACE_IMAGES
 SLOT="b"
 USERSPACE_IMAGES=(["boot_${SLOT}"]="boot.img"