diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-11 19:56:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-11 19:56:54 +0000 |
| commit | d0e3afebe9cb67ec7fc86c9c5b83291f445d1622 (patch) | |
| tree | eb785a57aa751e2a67415f75022f356c7b3d5006 /emulator/opengl/tests/ut_renderer/Renderer.h | |
| parent | e988e0593918f2d493ced9b6cf5c57c9f9686358 (diff) | |
| parent | aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a (diff) | |
| download | sdk-d0e3afebe9cb67ec7fc86c9c5b83291f445d1622.zip sdk-d0e3afebe9cb67ec7fc86c9c5b83291f445d1622.tar.gz sdk-d0e3afebe9cb67ec7fc86c9c5b83291f445d1622.tar.bz2 | |
Merge "emulator/opengl: Remove android::Mutex." into idea133
Diffstat (limited to 'emulator/opengl/tests/ut_renderer/Renderer.h')
| -rw-r--r-- | emulator/opengl/tests/ut_renderer/Renderer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/tests/ut_renderer/Renderer.h b/emulator/opengl/tests/ut_renderer/Renderer.h index cdf10b6..81f4077 100644 --- a/emulator/opengl/tests/ut_renderer/Renderer.h +++ b/emulator/opengl/tests/ut_renderer/Renderer.h @@ -19,7 +19,7 @@ #include "RendererSurface.h" #include "RendererContext.h" #include "NativeWindowing.h" -#include <utils/threads.h> +#include "emugl/common/mutex.h" class RenderingThread; @@ -57,6 +57,6 @@ private: NativeWindowing *m_nw; EGLDisplay m_dpy; - android::Mutex m_mutex; // single global mutex for the renderer class; + emugl::Mutex m_mutex; // single global mutex for the renderer class; }; #endif |