Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: mojo/mojo.gyp

Issue 48323005: Add a basic NativeViewportX11 for Mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make GL work Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | mojo/services/native_viewport/native_viewport_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 4267, 169 4267,
170 ], 170 ],
171 }], 171 }],
172 ], 172 ],
173 }, 173 },
174 { 174 {
175 'target_name': 'mojo_shell', 175 'target_name': 'mojo_shell',
176 'type': 'executable', 176 'type': 'executable',
177 'dependencies': [ 177 'dependencies': [
178 '../base/base.gyp:base', 178 '../base/base.gyp:base',
179 '../ui/gl/gl.gyp:gl',
179 '../url/url.gyp:url_lib', 180 '../url/url.gyp:url_lib',
180 'mojo_shell_lib', 181 'mojo_shell_lib',
181 'mojo_system', 182 'mojo_system',
182 ], 183 ],
183 'sources': [ 184 'sources': [
184 'shell/desktop/mojo_main.cc', 185 'shell/desktop/mojo_main.cc',
185 ], 186 ],
186 'conditions': [ 187 'conditions': [
187 ['OS == "win"', { 188 ['OS == "win"', {
188 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 189 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', 391 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
391 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', 392 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
392 'native_lib_target': 'libmojo_shell', 393 'native_lib_target': 'libmojo_shell',
393 }, 394 },
394 'includes': [ '../build/java_apk.gypi' ], 395 'includes': [ '../build/java_apk.gypi' ],
395 } 396 }
396 ], 397 ],
397 }], 398 }],
398 ], 399 ],
399 } 400 }
OLDNEW
« no previous file with comments | « no previous file | mojo/services/native_viewport/native_viewport_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698