| commit | e7e87a14401fc6504ad36d5fae90a9103b76ec97 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Oct 01 10:48:08 2015 -0700 |
| committer | Qiwen Zhao <zhao@google.com> | Thu Oct 01 10:48:08 2015 -0700 |
| tree | 759267e1a8295ea9e0524a4dad23427e825f2feb | |
| parent | 1afae671b7570b24f50331a9eab2afed193fb25f [diff] | |
| parent | 1237f0a72935e344b0aa80e19905a8a200ab5ec9 [diff] |
Merge commit '1237f0a729' into stage-aosp-master
diff --git a/linux-x86_64/lib/gles_mesa/libGL.so b/linux-x86_64/lib/gles_mesa/libGL.so index 160f31a..75e18c3 100755 --- a/linux-x86_64/lib/gles_mesa/libGL.so +++ b/linux-x86_64/lib/gles_mesa/libGL.so Binary files differ
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 new file mode 100755 index 0000000..d5a865b --- /dev/null +++ b/linux-x86_64/lib/lib64EGL_translator.so Binary files differ
diff --git a/linux-x86_64/lib/lib64GLES_CM_translator.so b/linux-x86_64/lib/lib64GLES_CM_translator.so new file mode 100755 index 0000000..8da11ff --- /dev/null +++ b/linux-x86_64/lib/lib64GLES_CM_translator.so Binary files differ
diff --git a/linux-x86_64/lib/lib64GLES_V2_translator.so b/linux-x86_64/lib/lib64GLES_V2_translator.so new file mode 100755 index 0000000..2651065 --- /dev/null +++ b/linux-x86_64/lib/lib64GLES_V2_translator.so Binary files differ
diff --git a/linux-x86_64/lib/lib64OpenglRender.so b/linux-x86_64/lib/lib64OpenglRender.so new file mode 100755 index 0000000..7922c21 --- /dev/null +++ b/linux-x86_64/lib/lib64OpenglRender.so Binary files differ
diff --git a/linux-x86_64/lib64/gles_mesa/libGL.so b/linux-x86_64/lib64/gles_mesa/libGL.so index 5267d69..677c627 100755 --- a/linux-x86_64/lib64/gles_mesa/libGL.so +++ b/linux-x86_64/lib64/gles_mesa/libGL.so Binary files differ
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/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 index 1429b29..d7de333 100755 --- a/windows/emulator64-ranchu-arm64.exe +++ b/windows/emulator64-ranchu-arm64.exe Binary files differ
diff --git a/windows/emulator64-ranchu-mips64.exe b/windows/emulator64-ranchu-mips64.exe index 6ae5fb2..1292bac 100755 --- a/windows/emulator64-ranchu-mips64.exe +++ b/windows/emulator64-ranchu-mips64.exe Binary files differ
diff --git a/windows/lib/gles_mesa/mesa_opengl32.dll b/windows/lib/gles_mesa/opengl32.dll similarity index 69% rename from windows/lib/gles_mesa/mesa_opengl32.dll rename to windows/lib/gles_mesa/opengl32.dll index 82e3b7a..1926e2f 100755 --- a/windows/lib/gles_mesa/mesa_opengl32.dll +++ 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/lib64/gles_mesa/mesa_opengl32.dll b/windows/lib64/gles_mesa/opengl32.dll similarity index 66% rename from windows/lib64/gles_mesa/mesa_opengl32.dll rename to windows/lib64/gles_mesa/opengl32.dll index 5d7c94a..1790017 100755 --- a/windows/lib64/gles_mesa/mesa_opengl32.dll +++ 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/lib64/lib64EGL_translator.dll b/windows/lib64/lib64EGL_translator.dll deleted file mode 100755 index 40c2c0a..0000000 --- a/windows/lib64/lib64EGL_translator.dll +++ /dev/null Binary files differ
diff --git a/windows/lib64/lib64GLES_CM_translator.dll b/windows/lib64/lib64GLES_CM_translator.dll deleted file mode 100755 index bd9c93d..0000000 --- a/windows/lib64/lib64GLES_CM_translator.dll +++ /dev/null Binary files differ
diff --git a/windows/lib64/lib64GLES_V2_translator.dll b/windows/lib64/lib64GLES_V2_translator.dll deleted file mode 100755 index e722bd3..0000000 --- a/windows/lib64/lib64GLES_V2_translator.dll +++ /dev/null Binary files differ
diff --git a/windows/lib64/lib64OpenglRender.dll b/windows/lib64/lib64OpenglRender.dll deleted file mode 100755 index b905bc5..0000000 --- a/windows/lib64/lib64OpenglRender.dll +++ /dev/null Binary files differ