| commit | f663d5c9d194f95795e95f7dd506c21a3c03d7d1 | [log] [tgz] |
|---|---|---|
| author | gitbuildkicker <android-build@google.com> | Fri Jan 20 12:38:36 2017 -0800 |
| committer | gitbuildkicker <android-build@google.com> | Fri Jan 20 12:38:36 2017 -0800 |
| tree | b6515c9af3cb398d9bf62b41202716d15c0061d0 | |
| parent | 56482dfd2a26b091bcd845228dc3349fc87d6a7f [diff] | |
| parent | 81ff116567ad1554fa74434c359725e7738acf83 [diff] |
merge in emu-2.3-release history after reset to emu-master-dev
diff --git a/arm/3.18/kernel-qemu2 b/arm/3.18/kernel-qemu2 index 0eb2eeb..aee7670 100644 --- a/arm/3.18/kernel-qemu2 +++ b/arm/3.18/kernel-qemu2 Binary files differ
diff --git a/arm/ranchu/kernel-qemu b/arm/ranchu/kernel-qemu index 3437dc8..d4fc4e3 100644 --- a/arm/ranchu/kernel-qemu +++ b/arm/ranchu/kernel-qemu Binary files differ
diff --git a/arm64/3.18/kernel-qemu2 b/arm64/3.18/kernel-qemu2 index 89af8c0..fcb4758 100644 --- a/arm64/3.18/kernel-qemu2 +++ b/arm64/3.18/kernel-qemu2 Binary files differ
diff --git a/arm64/kernel-qemu b/arm64/kernel-qemu index fd89a3b..f525500 100755 --- a/arm64/kernel-qemu +++ b/arm64/kernel-qemu Binary files differ
diff --git a/mips/3.18/kernel-qemu2 b/mips/3.18/kernel-qemu2 index 7243682..39749d1 100644 --- a/mips/3.18/kernel-qemu2 +++ b/mips/3.18/kernel-qemu2 Binary files differ
diff --git a/mips/ranchu/kernel-qemu b/mips/ranchu/kernel-qemu index 43a5f0a..8bc7ef3 100755 --- a/mips/ranchu/kernel-qemu +++ b/mips/ranchu/kernel-qemu Binary files differ
diff --git a/mips64/3.18/kernel-qemu2 b/mips64/3.18/kernel-qemu2 index e198141..299f1d6 100644 --- a/mips64/3.18/kernel-qemu2 +++ b/mips64/3.18/kernel-qemu2 Binary files differ
diff --git a/mips64/kernel-qemu b/mips64/kernel-qemu index f952ac5..4806cbe 100755 --- a/mips64/kernel-qemu +++ b/mips64/kernel-qemu Binary files differ
diff --git a/update_emu_kernels.sh b/update_emu_kernels.sh index 434170b..b36624b 100755 --- a/update_emu_kernels.sh +++ b/update_emu_kernels.sh
@@ -13,16 +13,16 @@ exit 1 fi -fetchtool='sso_client --location --request_timeout 60 --url' +fetchtool='sso_client -location -connect_timeout 60 -request_timeout 60 -url' build_server='https://android-build-uber.corp.google.com' branch_prefix='kernel-n-dev-android-goldfish-' # kernel_img[branch]="build_server_output local_file_name" declare -A kernel_img -kernel_img[3.4-arm]="zImage arm/kernel-qemu-armv7" -kernel_img[3.4-mips]="vmlinux mips/kernel-qemu" -kernel_img[3.4-x86]="bzImage x86/kernel-qemu" +#kernel_img[3.4-arm]="zImage arm/kernel-qemu-armv7" +#kernel_img[3.4-mips]="vmlinux mips/kernel-qemu" +#kernel_img[3.4-x86]="bzImage x86/kernel-qemu" kernel_img[3.10-arm]="zImage arm/ranchu/kernel-qemu" kernel_img[3.10-arm64]="Image arm64/kernel-qemu" kernel_img[3.10-mips]="vmlinux mips/ranchu/kernel-qemu"
diff --git a/x86/3.18/kernel-qemu2 b/x86/3.18/kernel-qemu2 index 5200c1b..c4db8c1 100644 --- a/x86/3.18/kernel-qemu2 +++ b/x86/3.18/kernel-qemu2 Binary files differ
diff --git a/x86/ranchu/kernel-qemu b/x86/ranchu/kernel-qemu index 0875232..15925a4 100644 --- a/x86/ranchu/kernel-qemu +++ b/x86/ranchu/kernel-qemu Binary files differ
diff --git a/x86_64/3.18/kernel-qemu2 b/x86_64/3.18/kernel-qemu2 index 23bb579..ca3aad8 100644 --- a/x86_64/3.18/kernel-qemu2 +++ b/x86_64/3.18/kernel-qemu2 Binary files differ
diff --git a/x86_64/kernel-qemu b/x86_64/kernel-qemu index fd4f48c..6300580 100644 --- a/x86_64/kernel-qemu +++ b/x86_64/kernel-qemu Binary files differ
diff --git a/x86_64/ranchu/kernel-qemu b/x86_64/ranchu/kernel-qemu index b48ae88..ece7a83 100644 --- a/x86_64/ranchu/kernel-qemu +++ b/x86_64/ranchu/kernel-qemu Binary files differ