aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-06-24 10:38:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-24 10:38:38 +0000
commit575a7f10d9584615fe6b59d42b9d580fbfef6091 (patch)
tree81d43131e9fda178c5e8c0e76e47ad371f339378
parentb88e7ba6efb2b6bf8eb17eb4b253cd0950965d08 (diff)
parentade43fa86a61ddfd264544be530835f5528df8a7 (diff)
downloadandroid-emulator-575a7f10d9584615fe6b59d42b9d580fbfef6091.tar.gz
am ade43fa8: Update: Fix emulation of older platforms.
* commit 'ade43fa86a61ddfd264544be530835f5528df8a7': Update: Fix emulation of older platforms.
-rw-r--r--README2
-rwxr-xr-xdarwin-x86_64/emulatorbin41464 -> 41664 bytes
-rwxr-xr-xdarwin-x86_64/emulator64-armbin2937320 -> 2937312 bytes
-rwxr-xr-xdarwin-x86_64/emulator64-mipsbin2865356 -> 2865356 bytes
-rwxr-xr-xdarwin-x86_64/emulator64-x86bin3035732 -> 3035724 bytes
-rwxr-xr-xlinux-x86_64/emulatorbin34896 -> 34896 bytes
-rwxr-xr-xlinux-x86_64/emulator64-armbin2618360 -> 2618328 bytes
-rwxr-xr-xlinux-x86_64/emulator64-mipsbin2669136 -> 2669072 bytes
-rwxr-xr-xlinux-x86_64/emulator64-x86bin2759568 -> 2759568 bytes
9 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index 2201d9d..2af2f9f 100644
--- a/README
+++ b/README
@@ -11,6 +11,6 @@ path of this AOSP repo workspace.
Below is the list of specific commits for each input directory used:
external/gtest e8981d1 Add LOCAL_MULTILIB := both for host targets.
-external/qemu 9cab753 Fix YAFFS2 support auto-detection logic.
+external/qemu fb8aca0 Fix emulation of old platform images.
sdk/emulator/opengl 1af0da2 Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133 automerge: 343a78f
diff --git a/darwin-x86_64/emulator b/darwin-x86_64/emulator
index 68c6cd6..4b4c616 100755
--- a/darwin-x86_64/emulator
+++ b/darwin-x86_64/emulator
Binary files differ
diff --git a/darwin-x86_64/emulator64-arm b/darwin-x86_64/emulator64-arm
index 4528a8e..58de403 100755
--- a/darwin-x86_64/emulator64-arm
+++ b/darwin-x86_64/emulator64-arm
Binary files differ
diff --git a/darwin-x86_64/emulator64-mips b/darwin-x86_64/emulator64-mips
index 8ae248f..d423501 100755
--- a/darwin-x86_64/emulator64-mips
+++ b/darwin-x86_64/emulator64-mips
Binary files differ
diff --git a/darwin-x86_64/emulator64-x86 b/darwin-x86_64/emulator64-x86
index 6cd19b7..3c3f513 100755
--- a/darwin-x86_64/emulator64-x86
+++ b/darwin-x86_64/emulator64-x86
Binary files differ
diff --git a/linux-x86_64/emulator b/linux-x86_64/emulator
index b838e52..84f942a 100755
--- a/linux-x86_64/emulator
+++ b/linux-x86_64/emulator
Binary files differ
diff --git a/linux-x86_64/emulator64-arm b/linux-x86_64/emulator64-arm
index 3be1c21..9bbd606 100755
--- a/linux-x86_64/emulator64-arm
+++ b/linux-x86_64/emulator64-arm
Binary files differ
diff --git a/linux-x86_64/emulator64-mips b/linux-x86_64/emulator64-mips
index c3343c4..d657714 100755
--- a/linux-x86_64/emulator64-mips
+++ b/linux-x86_64/emulator64-mips
Binary files differ
diff --git a/linux-x86_64/emulator64-x86 b/linux-x86_64/emulator64-x86
index 49aab0b..5572202 100755
--- a/linux-x86_64/emulator64-x86
+++ b/linux-x86_64/emulator64-x86
Binary files differ