summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 04:07:46 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 04:07:46 +0000
commit570c26d2b1d4dea12dc111c2ac93bbbab5238e62 (patch)
tree99eb1795e58525db71cac5b5f57919026a76aa62 /mojo/mojo.gyp
parent53239c130acd3e7ec757ddeecf0f50b2f425ad5f (diff)
downloadchromium_src-570c26d2b1d4dea12dc111c2ac93bbbab5238e62.zip
chromium_src-570c26d2b1d4dea12dc111c2ac93bbbab5238e62.tar.gz
chromium_src-570c26d2b1d4dea12dc111c2ac93bbbab5238e62.tar.bz2
Add (very!) basic GL support to mojo_shell
After this CL, we successfully initialize OpenGL on Android without crashing. I don't have my device locally today, so I haven't verified whether we can call glClear. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/50163002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 1d8b54a..d363175 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -272,6 +272,7 @@
},
'sources': [
'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
+ 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoView.java',
],
'variables': {
'jni_gen_package': 'mojo'
@@ -284,6 +285,8 @@
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../ui/gfx/gfx.gyp:gfx',
+ '../ui/gl/gl.gyp:gl',
'mojo_jni_headers',
'mojo_shell_lib',
],
@@ -291,6 +294,8 @@
'shell/android/library_loader.cc',
'shell/android/mojo_main.cc',
'shell/android/mojo_main.h',
+ 'shell/android/mojo_view.cc',
+ 'shell/android/mojo_view.h',
],
},
{