diff options
| author | zhenghao@google.com <zhenghao@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 23:41:39 +0000 |
|---|---|---|
| committer | zhenghao@google.com <zhenghao@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 23:41:39 +0000 |
| commit | 665ec133de02c0c8c1fcef13c4fe722aec036505 (patch) | |
| tree | d016a9a48471e30aaa26bf2ea471cf791b8eec5b /ui/gfx/gl | |
| parent | 0dda19952c2e3b058b367cb0ed8e989a63c2ef99 (diff) | |
| download | chromium_src-665ec133de02c0c8c1fcef13c4fe722aec036505.zip chromium_src-665ec133de02c0c8c1fcef13c4fe722aec036505.tar.gz chromium_src-665ec133de02c0c8c1fcef13c4fe722aec036505.tar.bz2 | |
Compile gl/ and surface/ on Android.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7981034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gl')
| -rw-r--r-- | ui/gfx/gl/gl.gyp | 2 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_bindings.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp index 3a9ad6d..f29f270 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gfx/gl/gl.gyp @@ -109,7 +109,7 @@ }, ], 'conditions': [ - ['OS != "mac"', { + ['OS != "mac" and OS != "android"', { 'sources': [ 'egl_util.cc', 'egl_util.h', diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gfx/gl/gl_bindings.h index 3615e88..8951225 100644 --- a/ui/gfx/gl/gl_bindings.h +++ b/ui/gfx/gl/gl_bindings.h @@ -65,6 +65,10 @@ typedef void* GLeglImageOES; typedef HDC EGLNativeDisplayType; typedef HBITMAP EGLNativePixmapType; typedef HWND EGLNativeWindowType; +#elif defined(OS_ANDROID) +typedef void *EGLNativeDisplayType; +typedef struct egl_native_pixmap_t *EGLNativePixmapType; +typedef struct ANativeWindow *EGLNativeWindowType; #elif defined(USE_WAYLAND) typedef struct wl_display *EGLNativeDisplayType; typedef struct wl_egl_pixmap *EGLNativePixmapType; |