commit | a7f214d191aaffef81d4a8956e5ea30870e49bf4 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Thu Oct 01 19:36:55 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 01 19:36:55 2015 +0000 |
tree | 759267e1a8295ea9e0524a4dad23427e825f2feb | |
parent | af728ba1c48f28a400b3c04e11769d92896380b5 [diff] | |
parent | 066c9208073ee6cc8fac58b8cb16fa40dd329998 [diff] |
Merge commit \'e7e87a1440\' into mnc-dr-dev-plus-aosp am: 066c920807 * commit '066c9208073ee6cc8fac58b8cb16fa40dd329998':
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 index c0886e5..7244ab5 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 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 index 1a22529..c767f51 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 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 index d1efc7e..928e667 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/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 index 4bc6b15..4cf5f05 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 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