Update emulator binaries (fix MIPS boot)android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release

cherry pick from aosp
commit 8946974dcbfeaa0abc7265d55d8447438b7e3c71

Author: David 'Digit' Turner <digit@google.com>
Date:   Tue, 06 Jan 2015 15:37:18 +0100

Update emulator binaries (fix MIPS boot).

This refreshes the emulator binaries to get a list of quality
bug fixes, detailed in README. Short version is:

- Fixes to MIPS emulation to allow aosp_mips-userdebug to boot
- Updated icon for windows and linux executables.
- Make emulator binaries unstripped by default (to get better
stack traces in case of crashes).
- Misc. GPU emulation fixes.

BUG=18416046

Change-Id: I8a5ddc170e9c80bff2187e2a209028c6df20bb20

36 files changed, 100 insertions, 3 deletions

diff --git a/README b/README
index 342cd69..0a66b77 100644
--- a/README
+++ b/README
@@ -10,7 +10,104 @@ 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        965a6e0 Parse fstab.goldfish file from ramdisk.img
-sdk/emulator/opengl  1af0da2 Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133 automerge: 343a78f
+external/qemu        a5822bc Fix Windows executable icon.
+external/gtest       56cad54 Use an older standard for the NDK gtest libs.
+
+Summary of changes:
+
+    $ cd external/qemu && git log --oneline --no-merges d5c0f67..a5822bc .
+        a5822bc Fix Windows executable icon.
+        06635c3 [MIPS] Make sure exception is raised on TLBRET_DIRTY
+        81a8e66 android/skin/: Ensure EmuGL is properly shutdown on program exit.
+        0d51ff9 Rename new launcher to emulator-ranchu-<arch> instead of emulator-<arch>
+        e94e3f0 android/qemu-launcher: Group target information.
+        fa2f4b3 android-emugl: Add ::emugl::MessageChannel<> template.
+        a1e792b android-emugl: Add ::emugl::CondVariable.
+        187686b android-emugl: Add RenderWindow class.
+        303a377 android-emugl: Fix RenderThread termination.
+        a82f04a android-emugl: Add IOStream::forceStop() method.
+        8b50488 android-emugl: Move render_api.h to host/libs/libOpenglRender
+        746d567 android/looper-base.cpp: Remove unnecessary declarations.
+        1ad4df9 android/base/sockets/SocketErrors.h: new header.
+        382ab59 android-emugl: Fix bitness-conditional modules.
+        2ef2784 android-emugl: Rename ThreadInfo.h to RenderThreadInfo.h
+        3c2cf23 android-emugl: Move m_rcDec from RenderThread to RenderThreadInfo.
+        4c5611d android-emugl: Fix thread stack leakage in RenderThread.
+        59ba348 android-emugl: Fix emugl::Thread stack reclaim.
+        b591c38 android-emugl: Minor cleanup of EglValidate.h
+        5cca984 android-emugl: Cleanup EglConfig definition.
+        e233fd0 android-emugl: Cleanup EglGlobalInfo
+        1d9dd76 android/utils/debug.c: Initialize android_verbose.
+        4d65868 android-emugl: Cleanup EglThreadInfo.h
+        e0b100d android-emugl: Change assert() into simple warnings.
+        cc8564e android/skin/region.h: Add unit tests.
+        8ba5fa7 android/skin/rect.h: Add unit test + fix skin_rect_equals
+        f65fccd Rename skin_keycodes_buffer_xxx -> skin_keycode_buffer_xxx
+        6ce0533 android/skin/keycode-buffer.c: Add unit test.
+        1670b8c android/skin: Adding unit test suite.
+        14829cf android/skin/keyboard: Fix SDL2 keyboard handling.
+        6216538 Add GL_OES_EGL_image_external to extensions query
+        95e080d [MIPS64] Create a wrapper for running MIPS64 ranchu QEMU
+        9a225fb Cleanup Obsolete LOCAL_PRELINK_MODULE.
+        7fc4b69 android/skin: Add support for SDL2.
+        dd5fa4c Fix emulator on Mac sending message crash issue
+        53e0d7f distrib/sdl2-2.0.3: New SDL2 sources + build file.
+        e392374 android/skin/: Move window scaling to android/skin/surface.h
+        5055903 android/skin/scaler.h: Add skin_scaler_reverse_map().
+        92f9e25 android/skin/surface.h: Simplify skin_surface_create_argb32_from
+        c7b7045 android/skin/scaler.h: Add skin_scaler_free().
+        e907a63 android/skin/surface.h: Remove obsolete functions.
+        b7273d3 android/skin/window.c: Add SkinSurface for each ADisplay.
+        80bf968 android/skin/: Add skin_surface_upload()
+        4a7ca74 android/skin/: Add skin_surface_update_scaled()
+        b676607 [MIPS64] Add mips64 target support to build-kernel.sh
+        a68e95b Remove bad error message about missing icon on Windows.
+        18db6cc Use GPU emulation sources in distrib/android-emugl/
+        b0024fb Print clearer message when missing kernel file
+        fd706d9 Print more specific error message if avd not found
+        9bb1b27 distrib/android-emugl: Move Android GPU emulation sources here.
+        c99a04b Fix missing enter key
+        9c5b276 Remove unsed check for simulator
+        7370999 Fix missing backspace key
+        4aa2dc7 Fix missing backspace key
+        0b86b5f Adds ANDROID_AVD_HOME and ANDROID_EMULATOR_HOME
+        2a6e0b9 Adds ANDROID_AVD_HOME and ANDROID_EMULATOR_HOME
+        b3fa4bc Fix keyboard emulation.
+        13c2556 Implement initial screen orientation suport
+        9e80ce6 remove two obsolete functions.
+        a46fc2c android-configure.sh: Move OS X SDK detection code up.
+        c98fa77 Fix keyboard emulation.
+        b13e871 Add new -list-avds option.
+        ff2c689 Implement initial screen orientation suport
+        922418b Ensure SDL_LDLIBS is properly used when linking SDL.
+        68b8f8b remove two obsolete functions.
+        d3d143b Fix emulator freeze due to infinite loop
+        70166d6 Fix emulator freeze due to infinite loop
+        3def4f8 Sets ro.opengles.version property
+        ba14a81 android-rebuild.sh: Run emugen_unittests.
+        0a6c7e5 Make emulator binaries unstripped by default.
+        d904d4d Turn emugen unittests back on
+        81e9011 Turn emugen unittests back on
+        004a0f9 Revert the test on emugen
+        3341c55 Check OSX SDK version
+        64222eb Fix bug in profiling support:
+        d1964d7 Update icon files with new Material Design assets.
+        c130748 darwin: Remove ccache-induced clang warnings.
+        a3df28e Warn against use of old host CPU for x86/64 emulation.
+        92b6aac docs/SOURCE-CODE-ORGANIZATION.TXT
+        06e386d Fix Darwin binary.
+        08f5da3 enable SSE4.1, 4.2 and POPCNT for x86-64
+        18bb91b android/icons.h: Fix Darwin icon.
+        16c74a0 Fix Darwin dyld launch error.
+        7866fa6 package-release.sh: Force remote darwin build to use prebuilt toolchain.
+        7ae1a26 Update Linux emulator icon to 128x128 size.
+        391f8d7 distrib/update-emugl-sources.sh: New script.
+        1670f0a Run 'emugen' test suite as part of android-rebuild.sh
+        6c882a6 [MIPS64] fasttlb : Add check for high segbits
+
+    $ cd external/gtest && git log --oneline --no-merges fde6da7..56cad54 .
+        56cad54 Use an older standard for the NDK gtest libs.
+        ce2c523 Make the libc++ libraries the primary.
+        f694f2b Remove the host libstdc++ compiled libraries.
+        3803e25 Be explicit about the STL for host modules.
 
diff --git a/darwin-x86_64/emulator b/darwin-x86_64/emulator
index 4b4c616..aab3e35 100755
--- a/darwin-x86_64/emulator
+++ b/darwin-x86_64/emulator
diff --git a/darwin-x86_64/emulator64-arm b/darwin-x86_64/emulator64-arm
index ccb29be..2bc3a5c 100755
--- a/darwin-x86_64/emulator64-arm
+++ b/darwin-x86_64/emulator64-arm
diff --git a/darwin-x86_64/emulator64-arm64 b/darwin-x86_64/emulator64-arm64
new file mode 100755
index 0000000..9766783
--- /dev/null
+++ b/darwin-x86_64/emulator64-arm64
diff --git a/darwin-x86_64/emulator64-mips b/darwin-x86_64/emulator64-mips
index 3b98384..b7adb02 100755
--- a/darwin-x86_64/emulator64-mips
+++ b/darwin-x86_64/emulator64-mips
diff --git a/darwin-x86_64/emulator64-x86 b/darwin-x86_64/emulator64-x86
index b38eadc..c9e3a06 100755
--- a/darwin-x86_64/emulator64-x86
+++ b/darwin-x86_64/emulator64-x86
diff --git a/darwin-x86_64/lib/lib64EGL_translator.dylib b/darwin-x86_64/lib/lib64EGL_translator.dylib
index e583b22..89ac217 100755
--- a/darwin-x86_64/lib/lib64EGL_translator.dylib
+++ b/darwin-x86_64/lib/lib64EGL_translator.dylib
diff --git a/darwin-x86_64/lib/lib64GLES_CM_translator.dylib b/darwin-x86_64/lib/lib64GLES_CM_translator.dylib
index 4cda17a..f18b18b 100755
--- a/darwin-x86_64/lib/lib64GLES_CM_translator.dylib
+++ b/darwin-x86_64/lib/lib64GLES_CM_translator.dylib
diff --git a/darwin-x86_64/lib/lib64GLES_V2_translator.dylib b/darwin-x86_64/lib/lib64GLES_V2_translator.dylib
index 593bf14..13f6df0 100755
--- a/darwin-x86_64/lib/lib64GLES_V2_translator.dylib
+++ b/darwin-x86_64/lib/lib64GLES_V2_translator.dylib
diff --git a/darwin-x86_64/lib/lib64OpenglRender.dylib b/darwin-x86_64/lib/lib64OpenglRender.dylib
index 382d370..96f08ba 100755
--- a/darwin-x86_64/lib/lib64OpenglRender.dylib
+++ b/darwin-x86_64/lib/lib64OpenglRender.dylib
diff --git a/linux-x86_64/emulator b/linux-x86_64/emulator
index 84f942a..25c20da 100755
--- a/linux-x86_64/emulator
+++ b/linux-x86_64/emulator
diff --git a/linux-x86_64/emulator-arm b/linux-x86_64/emulator-arm
new file mode 100755
index 0000000..df315a6
--- /dev/null
+++ b/linux-x86_64/emulator-arm
diff --git a/linux-x86_64/emulator-mips b/linux-x86_64/emulator-mips
new file mode 100755
index 0000000..aeac722
--- /dev/null
+++ b/linux-x86_64/emulator-mips
diff --git a/linux-x86_64/emulator-x86 b/linux-x86_64/emulator-x86
new file mode 100755
index 0000000..194aaf8
--- /dev/null
+++ b/linux-x86_64/emulator-x86
diff --git a/linux-x86_64/emulator64-arm b/linux-x86_64/emulator64-arm
index 271e9c5..a6df9b4 100755
--- a/linux-x86_64/emulator64-arm
+++ b/linux-x86_64/emulator64-arm
diff --git a/linux-x86_64/emulator64-arm64 b/linux-x86_64/emulator64-arm64
new file mode 100755
index 0000000..6513671
--- /dev/null
+++ b/linux-x86_64/emulator64-arm64
diff --git a/linux-x86_64/emulator64-mips b/linux-x86_64/emulator64-mips
index 4cb2713..79fca39 100755
--- a/linux-x86_64/emulator64-mips
+++ b/linux-x86_64/emulator64-mips
diff --git a/linux-x86_64/emulator64-x86 b/linux-x86_64/emulator64-x86
index c9e3d73..1879dad 100755
--- a/linux-x86_64/emulator64-x86
+++ b/linux-x86_64/emulator64-x86
diff --git a/linux-x86_64/lib/lib64EGL_translator.so b/linux-x86_64/lib/lib64EGL_translator.so
index d5a865b..2f03be9 100755
--- a/linux-x86_64/lib/lib64EGL_translator.so
+++ b/linux-x86_64/lib/lib64EGL_translator.so
diff --git a/linux-x86_64/lib/lib64GLES_CM_translator.so b/linux-x86_64/lib/lib64GLES_CM_translator.so
index 3e19170..af715c2 100755
--- a/linux-x86_64/lib/lib64GLES_CM_translator.so
+++ b/linux-x86_64/lib/lib64GLES_CM_translator.so
diff --git a/linux-x86_64/lib/lib64GLES_V2_translator.so b/linux-x86_64/lib/lib64GLES_V2_translator.so
index 2651065..bb24dd6 100755
--- a/linux-x86_64/lib/lib64GLES_V2_translator.so
+++ b/linux-x86_64/lib/lib64GLES_V2_translator.so
diff --git a/linux-x86_64/lib/lib64OpenglRender.so b/linux-x86_64/lib/lib64OpenglRender.so
index dd29bb1..83052ff 100755
--- a/linux-x86_64/lib/lib64OpenglRender.so
+++ b/linux-x86_64/lib/lib64OpenglRender.so
diff --git a/linux-x86_64/lib/libEGL_translator.so b/linux-x86_64/lib/libEGL_translator.so
new file mode 100755
index 0000000..e735f38
--- /dev/null
+++ b/linux-x86_64/lib/libEGL_translator.so
diff --git a/linux-x86_64/lib/libGLES_CM_translator.so b/linux-x86_64/lib/libGLES_CM_translator.so
new file mode 100755
index 0000000..d87648a
--- /dev/null
+++ b/linux-x86_64/lib/libGLES_CM_translator.so
diff --git a/linux-x86_64/lib/libGLES_V2_translator.so b/linux-x86_64/lib/libGLES_V2_translator.so
new file mode 100755
index 0000000..330529f
--- /dev/null
+++ b/linux-x86_64/lib/libGLES_V2_translator.so
diff --git a/linux-x86_64/lib/libOpenglRender.so b/linux-x86_64/lib/libOpenglRender.so
new file mode 100755
index 0000000..d427231
--- /dev/null
+++ b/linux-x86_64/lib/libOpenglRender.so
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64 b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
new file mode 100755
index 0000000..ba85da7
--- /dev/null
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
diff --git a/windows/emulator-arm.exe b/windows/emulator-arm.exe
new file mode 100755
index 0000000..e2ff0b2
--- /dev/null
+++ b/windows/emulator-arm.exe
diff --git a/windows/emulator-mips.exe b/windows/emulator-mips.exe
new file mode 100755
index 0000000..820c22a
--- /dev/null
+++ b/windows/emulator-mips.exe
diff --git a/windows/emulator-x86.exe b/windows/emulator-x86.exe
new file mode 100755
index 0000000..98b3c7e
--- /dev/null
+++ b/windows/emulator-x86.exe
diff --git a/windows/emulator.exe b/windows/emulator.exe
new file mode 100755
index 0000000..95d2268
--- /dev/null
+++ b/windows/emulator.exe
diff --git a/windows/emulator64-arm64.exe b/windows/emulator64-arm64.exe
new file mode 100755
index 0000000..6ac6791
--- /dev/null
+++ b/windows/emulator64-arm64.exe
diff --git a/windows/lib/libEGL_translator.dll b/windows/lib/libEGL_translator.dll
new file mode 100755
index 0000000..2eae41a
--- /dev/null
+++ b/windows/lib/libEGL_translator.dll
diff --git a/windows/lib/libGLES_CM_translator.dll b/windows/lib/libGLES_CM_translator.dll
new file mode 100755
index 0000000..43bbee7
--- /dev/null
+++ b/windows/lib/libGLES_CM_translator.dll
diff --git a/windows/lib/libGLES_V2_translator.dll b/windows/lib/libGLES_V2_translator.dll
new file mode 100755
index 0000000..68810bd
--- /dev/null
+++ b/windows/lib/libGLES_V2_translator.dll
diff --git a/windows/lib/libOpenglRender.dll b/windows/lib/libOpenglRender.dll
new file mode 100755
index 0000000..cf03491
--- /dev/null
+++ b/windows/lib/libOpenglRender.dll