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

Side by Side Diff: ui/gfx/gfx.gyp

Issue 127043005: Adds NOTIMPLEMENTED cursor for android and includes path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clipboard_android->cursor_android Created 6 years, 11 months 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
« no previous file with comments | « ui/base/cursor/cursor_android.cc ('k') | ui/ui.gyp » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 ], 384 ],
385 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 385 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
386 # C4324 is structure was padded due to __declspec(align()), which is 386 # C4324 is structure was padded due to __declspec(align()), which is
387 # uninteresting. 387 # uninteresting.
388 'msvs_disabled_warnings': [ 4267, 4324 ], 388 'msvs_disabled_warnings': [ 4267, 4324 ],
389 }], 389 }],
390 ['OS=="android"', { 390 ['OS=="android"', {
391 'sources!': [ 391 'sources!': [
392 'animation/throb_animation.cc', 392 'animation/throb_animation.cc',
393 'display_observer.cc', 393 'display_observer.cc',
394 'path.cc',
395 'selection_model.cc', 394 'selection_model.cc',
396 ], 395 ],
397 'dependencies': [ 396 'dependencies': [
398 'gfx_jni_headers', 397 'gfx_jni_headers',
399 ], 398 ],
400 'link_settings': { 399 'link_settings': {
401 'libraries': [ 400 'libraries': [
402 '-landroid', 401 '-landroid',
403 '-ljnigraphics', 402 '-ljnigraphics',
404 ], 403 ],
405 }, 404 },
406 }], 405 }],
406 ['OS=="android" and use_aura==0', {
407 'sources!': [
408 'path.cc',
409 ],
410 }],
407 ['OS=="android" and android_webview_build==0', { 411 ['OS=="android" and android_webview_build==0', {
408 'dependencies': [ 412 'dependencies': [
409 '<(DEPTH)/base/base.gyp:base_java', 413 '<(DEPTH)/base/base.gyp:base_java',
410 ], 414 ],
411 }], 415 }],
412 ['OS=="android" or OS=="ios"', { 416 ['OS=="android" or OS=="ios"', {
413 'sources!': [ 417 'sources!': [
414 'render_text.cc', 418 'render_text.cc',
415 'render_text.h', 419 'render_text.h',
416 'text_utils_skia.cc', 420 'text_utils_skia.cc',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 'variables': { 483 'variables': {
480 'jni_gen_package': 'ui/gfx', 484 'jni_gen_package': 'ui/gfx',
481 'jni_generator_ptr_type': 'long' 485 'jni_generator_ptr_type': 'long'
482 }, 486 },
483 'includes': [ '../../build/jni_generator.gypi' ], 487 'includes': [ '../../build/jni_generator.gypi' ],
484 }, 488 },
485 ], 489 ],
486 }], 490 }],
487 ], 491 ],
488 } 492 }
OLDNEW
« no previous file with comments | « ui/base/cursor/cursor_android.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698