aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-08-20 17:57:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-08-20 17:57:29 +0000
commit5e45f5f1f12fd1bbeec22ab39946164c822175ef (patch)
tree3b054e7bdddf9db9ca5bc8305777036e7d0a75c6
parent290d6b6387b91d3f891ce17cfbf4df84b9f95a87 (diff)
parentd86f582e406d95ab07916cb9eded6631afd97a14 (diff)
downloadandroid-emulator-5e45f5f1f12fd1bbeec22ab39946164c822175ef.tar.gz
Update: use 1GB minimum RAM for ARM64 emulation.
automerge: d86f582 * commit 'd86f582e406d95ab07916cb9eded6631afd97a14': Update: use 1GB minimum RAM for ARM64 emulation.
-rw-r--r--README25
-rwxr-xr-xdarwin-x86_64/emulator64-armbin2894256 -> 2894264 bytes
-rwxr-xr-xdarwin-x86_64/emulator64-arm64bin343148 -> 343148 bytes
-rwxr-xr-xdarwin-x86_64/emulator64-mipsbin2790724 -> 2790716 bytes
-rwxr-xr-xdarwin-x86_64/emulator64-x86bin2997428 -> 2997420 bytes
-rwxr-xr-xlinux-x86_64/emulator64-arm64bin286192 -> 286192 bytes
6 files changed, 15 insertions, 10 deletions
diff --git a/README b/README
index ffec1ce..7e16fdf 100644
--- a/README
+++ b/README
@@ -10,21 +10,26 @@ path of this AOSP repo workspace.
Below is the list of specific commits for each input directory used:
-external/qemu 6b3cbff Fixes emulator and adb server disconnect issue
+external/qemu 09e4b2f arm64: Ensure a minimum of 1GB of RAM.
sdk/emulator/opengl 1ee821e Support dynamic lib name without ".dylib" on Mac
external/gtest e8981d1 Add LOCAL_MULTILIB := both for host targets.
Summary of changes:
- $ cd external/qemu && git log --oneline --no-merges ef4b60f..6b3cbff .
- 6b3cbff Fixes emulator and adb server disconnect issue
- cbe657d TCG: Update to QEMU 2.0.0 version.
- fa22f46 android-configure.sh: Use GCC 4.8 on Linux.
- 36c80b3 Force network port for adb qemu communication.
- 4050560 Disable the adb qemud pipe by default.
- 2944ca1 Properly reset the value of max_fd when it becomes invalid.
- 7b5c578 Fixed network access in windows emulator
- 9e4a448 build-kernel.sh: Make --arch=arm64 build ranchu version by default.
+ $ cd external/qemu && git log --oneline --no-merges 6b3cbff..09e4b2f .
+ 09e4b2f arm64: Ensure a minimum of 1GB of RAM.
+ 71bab60 SocketDrainer: refactor on top of android/base/
+ e584088 android/looper.h: Implement looper_newCore() on top of QemuLooper.
+ 47b0aac android/qemu/base/async/Looper.h: new helper class.
+ e3a03dd android/looper.h: Refactor with android/base/async/Looper.h
+ 2d45868 android/iolooper.h: Refactor on top of SocketWaiter
+ ecdc17c android/base/async/Looper.h: new helper class
+ 7f274c2 android/base/sockets/SocketWaiter.h: new helper class.
+ 1ccec5b android/base/sockets/{ScopedSocket,SocketUtils}.h: new headers.
+ 58d2ce0 android/base/containers/ScopedPointerSet.h: new helper class.
+ ba4d384 android/base/containers/PointerSet.h: new container class.
+ 8f09289 android/base/containers/HashUtils.h: new helper class.
+ 41410e9 android/base/containers/TailQueueList.h: new helper class.
# No changes to sdk/emulator/opengl
# No changes to external/gtest
diff --git a/darwin-x86_64/emulator64-arm b/darwin-x86_64/emulator64-arm
index a80acd3..8a19d72 100755
--- a/darwin-x86_64/emulator64-arm
+++ b/darwin-x86_64/emulator64-arm
Binary files differ
diff --git a/darwin-x86_64/emulator64-arm64 b/darwin-x86_64/emulator64-arm64
index 8f4b553..c1b26ce 100755
--- a/darwin-x86_64/emulator64-arm64
+++ b/darwin-x86_64/emulator64-arm64
Binary files differ
diff --git a/darwin-x86_64/emulator64-mips b/darwin-x86_64/emulator64-mips
index ce155ec..534a54f 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 be981ed..295b341 100755
--- a/darwin-x86_64/emulator64-x86
+++ b/darwin-x86_64/emulator64-x86
Binary files differ
diff --git a/linux-x86_64/emulator64-arm64 b/linux-x86_64/emulator64-arm64
index bd30009..79a00ae 100755
--- a/linux-x86_64/emulator64-arm64
+++ b/linux-x86_64/emulator64-arm64
Binary files differ