| commit | 066c9208073ee6cc8fac58b8cb16fa40dd329998 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Oct 01 12:32:25 2015 -0700 |
| committer | Qiwen Zhao <zhao@google.com> | Thu Oct 01 12:32:25 2015 -0700 |
| tree | 3a5fdb8ddad12c331cb9635af5e10e98f6cbe86d | |
| parent | 7df367fe4813e15865fbfab2bea29577f64dd85f [diff] | |
| parent | e7e87a14401fc6504ad36d5fae90a9103b76ec97 [diff] |
Merge commit 'e7e87a1440' into mnc-dr-dev-plus-aosp
diff --git a/linux-x86_64/lib/gles_mesa/libGL.so b/linux-x86_64/lib/gles_mesa/libGL.so index 75e18c3..160f31a 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 index 7244ab5..c0886e5 100755 --- a/linux-x86_64/lib/gles_mesa/libosmesa.so +++ 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 8da11ff..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 7922c21..0000000 --- a/linux-x86_64/lib/lib64OpenglRender.so +++ /dev/null Binary files differ
diff --git a/linux-x86_64/lib64/gles_mesa/libGL.so b/linux-x86_64/lib64/gles_mesa/libGL.so index 677c627..5267d69 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 index c767f51..1a22529 100755 --- a/linux-x86_64/lib64/gles_mesa/libosmesa.so +++ b/linux-x86_64/lib64/gles_mesa/libosmesa.so Binary files differ
diff --git a/windows/emulator64-arm64.exe b/windows/emulator64-arm64.exe deleted file mode 100755 index 6ac6791..0000000 --- a/windows/emulator64-arm64.exe +++ /dev/null Binary files differ
diff --git a/windows/emulator64-ranchu-arm64.exe b/windows/emulator64-ranchu-arm64.exe index d7de333..1429b29 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 1292bac..6ae5fb2 100755 --- a/windows/emulator64-ranchu-mips64.exe +++ b/windows/emulator64-ranchu-mips64.exe Binary files differ
diff --git a/windows/lib/gles_mesa/opengl32.dll b/windows/lib/gles_mesa/mesa_opengl32.dll similarity index 69% rename from windows/lib/gles_mesa/opengl32.dll rename to windows/lib/gles_mesa/mesa_opengl32.dll index 1926e2f..82e3b7a 100755 --- a/windows/lib/gles_mesa/opengl32.dll +++ b/windows/lib/gles_mesa/mesa_opengl32.dll Binary files differ
diff --git a/windows/lib/gles_mesa/osmesa.dll b/windows/lib/gles_mesa/osmesa.dll index 928e667..d1efc7e 100755 --- a/windows/lib/gles_mesa/osmesa.dll +++ b/windows/lib/gles_mesa/osmesa.dll Binary files differ
diff --git a/windows/lib64/gles_mesa/opengl32.dll b/windows/lib64/gles_mesa/mesa_opengl32.dll similarity index 66% rename from windows/lib64/gles_mesa/opengl32.dll rename to windows/lib64/gles_mesa/mesa_opengl32.dll index 1790017..5d7c94a 100755 --- a/windows/lib64/gles_mesa/opengl32.dll +++ b/windows/lib64/gles_mesa/mesa_opengl32.dll Binary files differ
diff --git a/windows/lib64/gles_mesa/osmesa.dll b/windows/lib64/gles_mesa/osmesa.dll index 4cf5f05..4bc6b15 100755 --- a/windows/lib64/gles_mesa/osmesa.dll +++ b/windows/lib64/gles_mesa/osmesa.dll Binary files differ
diff --git a/windows/lib64/lib64EGL_translator.dll b/windows/lib64/lib64EGL_translator.dll new file mode 100755 index 0000000..40c2c0a --- /dev/null +++ b/windows/lib64/lib64EGL_translator.dll Binary files differ
diff --git a/windows/lib64/lib64GLES_CM_translator.dll b/windows/lib64/lib64GLES_CM_translator.dll new file mode 100755 index 0000000..bd9c93d --- /dev/null +++ b/windows/lib64/lib64GLES_CM_translator.dll Binary files differ
diff --git a/windows/lib64/lib64GLES_V2_translator.dll b/windows/lib64/lib64GLES_V2_translator.dll new file mode 100755 index 0000000..e722bd3 --- /dev/null +++ b/windows/lib64/lib64GLES_V2_translator.dll Binary files differ
diff --git a/windows/lib64/lib64OpenglRender.dll b/windows/lib64/lib64OpenglRender.dll new file mode 100755 index 0000000..b905bc5 --- /dev/null +++ b/windows/lib64/lib64OpenglRender.dll Binary files differ