am adf3d1bd: (-s ours) am 9e0c2870: update: Parse ramdisk.img to detect partition formats.
* commit 'adf3d1bd694f69bd92850a906a5beb870eab1394':
update: Parse ramdisk.img to detect partition formats.
diff --git a/README b/README
index 342cd69..3131294 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
This directory contains prebuilt emulator binaries that were generated by
running the following command on a 64-bit Linux machine:
- external/qemu/distrib/package-release.sh \
+ external/qemu/android/scripts/package-release.sh \
--darwin-ssh=<host> \
--copy-prebuilts=<path>
@@ -10,7 +10,12 @@
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 8ada71a emugl: Document FrameBuffer class.
+external/qemu-android 8ad041c hw/arm/ranch.c: Add firmware node to DT
+external/gtest 56cad54 Use an older standard for the NDK gtest libs.
+Summary of changes:
+
+ # No changes to external/qemu
+ # No changes to external/qemu-android
+ # No changes to external/gtest
diff --git a/darwin-x86_64/emulator b/darwin-x86_64/emulator
index 4b4c616..8a2b04b 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 ccb29be..7ecc40a 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 3b98384..884d7ca 100755
--- a/darwin-x86_64/emulator64-mips
+++ b/darwin-x86_64/emulator64-mips
Binary files differ
diff --git a/darwin-x86_64/emulator64-ranchu-arm64 b/darwin-x86_64/emulator64-ranchu-arm64
new file mode 100755
index 0000000..bdb315f
--- /dev/null
+++ b/darwin-x86_64/emulator64-ranchu-arm64
Binary files differ
diff --git a/darwin-x86_64/emulator64-ranchu-mips64 b/darwin-x86_64/emulator64-ranchu-mips64
new file mode 100755
index 0000000..6ff20bd
--- /dev/null
+++ b/darwin-x86_64/emulator64-ranchu-mips64
Binary files differ
diff --git a/darwin-x86_64/emulator64-x86 b/darwin-x86_64/emulator64-x86
index b38eadc..8c4b62d 100755
--- a/darwin-x86_64/emulator64-x86
+++ b/darwin-x86_64/emulator64-x86
Binary files differ
diff --git a/darwin-x86_64/lib/lib64EGL_translator.dylib b/darwin-x86_64/lib/lib64EGL_translator.dylib
deleted file mode 100755
index e583b22..0000000
--- a/darwin-x86_64/lib/lib64EGL_translator.dylib
+++ /dev/null
Binary files differ
diff --git a/darwin-x86_64/lib/lib64GLES_CM_translator.dylib b/darwin-x86_64/lib/lib64GLES_CM_translator.dylib
deleted file mode 100755
index 4cda17a..0000000
--- a/darwin-x86_64/lib/lib64GLES_CM_translator.dylib
+++ /dev/null
Binary files differ
diff --git a/darwin-x86_64/lib/lib64GLES_V2_translator.dylib b/darwin-x86_64/lib/lib64GLES_V2_translator.dylib
deleted file mode 100755
index 593bf14..0000000
--- a/darwin-x86_64/lib/lib64GLES_V2_translator.dylib
+++ /dev/null
Binary files differ
diff --git a/darwin-x86_64/lib/lib64OpenglRender.dylib b/darwin-x86_64/lib/lib64OpenglRender.dylib
deleted file mode 100755
index 382d370..0000000
--- a/darwin-x86_64/lib/lib64OpenglRender.dylib
+++ /dev/null
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64EGL_translator.dylib b/darwin-x86_64/lib64/lib64EGL_translator.dylib
new file mode 100755
index 0000000..3fd275a
--- /dev/null
+++ b/darwin-x86_64/lib64/lib64EGL_translator.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib b/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib
new file mode 100755
index 0000000..e9bfa2f
--- /dev/null
+++ b/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib b/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib
new file mode 100755
index 0000000..de29933
--- /dev/null
+++ b/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64OpenglRender.dylib b/darwin-x86_64/lib64/lib64OpenglRender.dylib
new file mode 100755
index 0000000..71a600f
--- /dev/null
+++ b/darwin-x86_64/lib64/lib64OpenglRender.dylib
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64 b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
new file mode 100755
index 0000000..2727f66
--- /dev/null
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el
new file mode 100755
index 0000000..084ac72
--- /dev/null
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el
Binary files differ
diff --git a/linux-x86_64/emulator b/linux-x86_64/emulator
index 84f942a..461188a 100755
--- a/linux-x86_64/emulator
+++ b/linux-x86_64/emulator
Binary files differ
diff --git a/linux-x86_64/emulator-arm b/linux-x86_64/emulator-arm
new file mode 100755
index 0000000..8c5776d
--- /dev/null
+++ b/linux-x86_64/emulator-arm
Binary files differ
diff --git a/linux-x86_64/emulator-mips b/linux-x86_64/emulator-mips
new file mode 100755
index 0000000..f71636f
--- /dev/null
+++ b/linux-x86_64/emulator-mips
Binary files differ
diff --git a/linux-x86_64/emulator-ranchu-arm64 b/linux-x86_64/emulator-ranchu-arm64
new file mode 100755
index 0000000..2304633
--- /dev/null
+++ b/linux-x86_64/emulator-ranchu-arm64
Binary files differ
diff --git a/linux-x86_64/emulator-ranchu-mips64 b/linux-x86_64/emulator-ranchu-mips64
new file mode 100755
index 0000000..d5ccae2
--- /dev/null
+++ b/linux-x86_64/emulator-ranchu-mips64
Binary files differ
diff --git a/linux-x86_64/emulator-x86 b/linux-x86_64/emulator-x86
new file mode 100755
index 0000000..13bb0b8
--- /dev/null
+++ b/linux-x86_64/emulator-x86
Binary files differ
diff --git a/linux-x86_64/emulator64-arm b/linux-x86_64/emulator64-arm
index 271e9c5..1cb2247 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 4cb2713..7de38c4 100755
--- a/linux-x86_64/emulator64-mips
+++ b/linux-x86_64/emulator64-mips
Binary files differ
diff --git a/linux-x86_64/emulator64-ranchu-arm64 b/linux-x86_64/emulator64-ranchu-arm64
new file mode 100755
index 0000000..c69d175
--- /dev/null
+++ b/linux-x86_64/emulator64-ranchu-arm64
Binary files differ
diff --git a/linux-x86_64/emulator64-ranchu-mips64 b/linux-x86_64/emulator64-ranchu-mips64
new file mode 100755
index 0000000..277b28f
--- /dev/null
+++ b/linux-x86_64/emulator64-ranchu-mips64
Binary files differ
diff --git a/linux-x86_64/emulator64-x86 b/linux-x86_64/emulator64-x86
index c9e3d73..0206a92 100755
--- a/linux-x86_64/emulator64-x86
+++ b/linux-x86_64/emulator64-x86
Binary files differ
diff --git a/linux-x86_64/lib/gles_mesa/libGL.so b/linux-x86_64/lib/gles_mesa/libGL.so
new file mode 100755
index 0000000..75e18c3
--- /dev/null
+++ b/linux-x86_64/lib/gles_mesa/libGL.so
Binary files differ
diff --git a/linux-x86_64/lib/gles_mesa/libGL.so.1 b/linux-x86_64/lib/gles_mesa/libGL.so.1
new file mode 120000
index 0000000..fc3a03e
--- /dev/null
+++ b/linux-x86_64/lib/gles_mesa/libGL.so.1
@@ -0,0 +1 @@
+libGL.so
\ No newline at end of file
diff --git a/linux-x86_64/lib/gles_mesa/libosmesa.so b/linux-x86_64/lib/gles_mesa/libosmesa.so
new file mode 100755
index 0000000..7244ab5
--- /dev/null
+++ b/linux-x86_64/lib/gles_mesa/libosmesa.so
Binary files differ
diff --git a/linux-x86_64/lib/lib64EGL_translator.so b/linux-x86_64/lib/lib64EGL_translator.so
deleted file mode 100755
index d5a865b..0000000
--- a/linux-x86_64/lib/lib64EGL_translator.so
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/lib/lib64GLES_CM_translator.so b/linux-x86_64/lib/lib64GLES_CM_translator.so
deleted file mode 100755
index 3e19170..0000000
--- a/linux-x86_64/lib/lib64GLES_CM_translator.so
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/lib/lib64GLES_V2_translator.so b/linux-x86_64/lib/lib64GLES_V2_translator.so
deleted file mode 100755
index 2651065..0000000
--- a/linux-x86_64/lib/lib64GLES_V2_translator.so
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/lib/lib64OpenglRender.so b/linux-x86_64/lib/lib64OpenglRender.so
deleted file mode 100755
index dd29bb1..0000000
--- a/linux-x86_64/lib/lib64OpenglRender.so
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64/lib/libEGL_translator.so b/linux-x86_64/lib/libEGL_translator.so
new file mode 100755
index 0000000..e39712b
--- /dev/null
+++ b/linux-x86_64/lib/libEGL_translator.so
Binary files differ
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..8f8bf9c
--- /dev/null
+++ b/linux-x86_64/lib/libGLES_CM_translator.so
Binary files differ
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..b61c801
--- /dev/null
+++ b/linux-x86_64/lib/libGLES_V2_translator.so
Binary files differ
diff --git a/linux-x86_64/lib/libOpenglRender.so b/linux-x86_64/lib/libOpenglRender.so
new file mode 100755
index 0000000..ce5c257
--- /dev/null
+++ b/linux-x86_64/lib/libOpenglRender.so
Binary files differ
diff --git a/linux-x86_64/lib64/gles_mesa/libGL.so b/linux-x86_64/lib64/gles_mesa/libGL.so
new file mode 100755
index 0000000..677c627
--- /dev/null
+++ b/linux-x86_64/lib64/gles_mesa/libGL.so
Binary files differ
diff --git a/linux-x86_64/lib64/gles_mesa/libGL.so.1 b/linux-x86_64/lib64/gles_mesa/libGL.so.1
new file mode 120000
index 0000000..fc3a03e
--- /dev/null
+++ b/linux-x86_64/lib64/gles_mesa/libGL.so.1
@@ -0,0 +1 @@
+libGL.so
\ No newline at end of file
diff --git a/linux-x86_64/lib64/gles_mesa/libosmesa.so b/linux-x86_64/lib64/gles_mesa/libosmesa.so
new file mode 100755
index 0000000..c767f51
--- /dev/null
+++ b/linux-x86_64/lib64/gles_mesa/libosmesa.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64EGL_translator.so b/linux-x86_64/lib64/lib64EGL_translator.so
new file mode 100755
index 0000000..7455134
--- /dev/null
+++ b/linux-x86_64/lib64/lib64EGL_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64GLES_CM_translator.so b/linux-x86_64/lib64/lib64GLES_CM_translator.so
new file mode 100755
index 0000000..1296651
--- /dev/null
+++ b/linux-x86_64/lib64/lib64GLES_CM_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64GLES_V2_translator.so b/linux-x86_64/lib64/lib64GLES_V2_translator.so
new file mode 100755
index 0000000..fc79cad
--- /dev/null
+++ b/linux-x86_64/lib64/lib64GLES_V2_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64OpenglRender.so b/linux-x86_64/lib64/lib64OpenglRender.so
new file mode 100755
index 0000000..a5bdfdd
--- /dev/null
+++ b/linux-x86_64/lib64/lib64OpenglRender.so
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86/qemu-system-aarch64 b/linux-x86_64/qemu/linux-x86/qemu-system-aarch64
new file mode 100755
index 0000000..ca30f21
--- /dev/null
+++ b/linux-x86_64/qemu/linux-x86/qemu-system-aarch64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86/qemu-system-mips64el b/linux-x86_64/qemu/linux-x86/qemu-system-mips64el
new file mode 100755
index 0000000..0e630c6
--- /dev/null
+++ b/linux-x86_64/qemu/linux-x86/qemu-system-mips64el
Binary files differ
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..5118278
--- /dev/null
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el b/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el
new file mode 100755
index 0000000..049fc34
--- /dev/null
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el
Binary files differ
diff --git a/windows/emulator-arm.exe b/windows/emulator-arm.exe
new file mode 100755
index 0000000..db58411
--- /dev/null
+++ b/windows/emulator-arm.exe
Binary files differ
diff --git a/windows/emulator-mips.exe b/windows/emulator-mips.exe
new file mode 100755
index 0000000..170de47
--- /dev/null
+++ b/windows/emulator-mips.exe
Binary files differ
diff --git a/windows/emulator-ranchu-arm64.exe b/windows/emulator-ranchu-arm64.exe
new file mode 100755
index 0000000..7378c0f
--- /dev/null
+++ b/windows/emulator-ranchu-arm64.exe
Binary files differ
diff --git a/windows/emulator-ranchu-mips64.exe b/windows/emulator-ranchu-mips64.exe
new file mode 100755
index 0000000..686adf4
--- /dev/null
+++ b/windows/emulator-ranchu-mips64.exe
Binary files differ
diff --git a/windows/emulator-x86.exe b/windows/emulator-x86.exe
new file mode 100755
index 0000000..dde97d6
--- /dev/null
+++ b/windows/emulator-x86.exe
Binary files differ
diff --git a/windows/emulator.exe b/windows/emulator.exe
new file mode 100755
index 0000000..d2042a2
--- /dev/null
+++ b/windows/emulator.exe
Binary files differ
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
Binary files differ
diff --git a/windows/emulator64-ranchu-arm64.exe b/windows/emulator64-ranchu-arm64.exe
new file mode 100755
index 0000000..d7de333
--- /dev/null
+++ b/windows/emulator64-ranchu-arm64.exe
Binary files differ
diff --git a/windows/emulator64-ranchu-mips64.exe b/windows/emulator64-ranchu-mips64.exe
new file mode 100755
index 0000000..1292bac
--- /dev/null
+++ b/windows/emulator64-ranchu-mips64.exe
Binary files differ
diff --git a/windows/lib/gles_mesa/opengl32.dll b/windows/lib/gles_mesa/opengl32.dll
new file mode 100755
index 0000000..1926e2f
--- /dev/null
+++ b/windows/lib/gles_mesa/opengl32.dll
Binary files differ
diff --git a/windows/lib/gles_mesa/osmesa.dll b/windows/lib/gles_mesa/osmesa.dll
new file mode 100755
index 0000000..928e667
--- /dev/null
+++ b/windows/lib/gles_mesa/osmesa.dll
Binary files differ
diff --git a/windows/lib/libEGL_translator.dll b/windows/lib/libEGL_translator.dll
new file mode 100755
index 0000000..1bb53bb
--- /dev/null
+++ b/windows/lib/libEGL_translator.dll
Binary files differ
diff --git a/windows/lib/libGLES_CM_translator.dll b/windows/lib/libGLES_CM_translator.dll
new file mode 100755
index 0000000..543532f
--- /dev/null
+++ b/windows/lib/libGLES_CM_translator.dll
Binary files differ
diff --git a/windows/lib/libGLES_V2_translator.dll b/windows/lib/libGLES_V2_translator.dll
new file mode 100755
index 0000000..b3422ba
--- /dev/null
+++ b/windows/lib/libGLES_V2_translator.dll
Binary files differ
diff --git a/windows/lib/libOpenglRender.dll b/windows/lib/libOpenglRender.dll
new file mode 100755
index 0000000..0ef65e7
--- /dev/null
+++ b/windows/lib/libOpenglRender.dll
Binary files differ
diff --git a/windows/lib64/gles_mesa/opengl32.dll b/windows/lib64/gles_mesa/opengl32.dll
new file mode 100755
index 0000000..1790017
--- /dev/null
+++ b/windows/lib64/gles_mesa/opengl32.dll
Binary files differ
diff --git a/windows/lib64/gles_mesa/osmesa.dll b/windows/lib64/gles_mesa/osmesa.dll
new file mode 100755
index 0000000..4cf5f05
--- /dev/null
+++ b/windows/lib64/gles_mesa/osmesa.dll
Binary files differ
diff --git a/windows/qemu/windows-x86/qemu-system-aarch64.exe b/windows/qemu/windows-x86/qemu-system-aarch64.exe
new file mode 100755
index 0000000..00b913c
--- /dev/null
+++ b/windows/qemu/windows-x86/qemu-system-aarch64.exe
Binary files differ
diff --git a/windows/qemu/windows-x86/qemu-system-mips64el.exe b/windows/qemu/windows-x86/qemu-system-mips64el.exe
new file mode 100755
index 0000000..28d50fb
--- /dev/null
+++ b/windows/qemu/windows-x86/qemu-system-mips64el.exe
Binary files differ
diff --git a/windows/qemu/windows-x86_64/qemu-system-aarch64.exe b/windows/qemu/windows-x86_64/qemu-system-aarch64.exe
new file mode 100755
index 0000000..071329f
--- /dev/null
+++ b/windows/qemu/windows-x86_64/qemu-system-aarch64.exe
Binary files differ
diff --git a/windows/qemu/windows-x86_64/qemu-system-mips64el.exe b/windows/qemu/windows-x86_64/qemu-system-mips64el.exe
new file mode 100755
index 0000000..03bbb5b
--- /dev/null
+++ b/windows/qemu/windows-x86_64/qemu-system-mips64el.exe
Binary files differ
