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

Side by Side Diff: ui/ui.gyp

Issue 134043003: Removes a couple of conflicting files from build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 ['OS=="android" and android_webview_build==0', { 585 ['OS=="android" and android_webview_build==0', {
586 'dependencies': [ 586 'dependencies': [
587 'android/ui_android.gyp:ui_java', 587 'android/ui_android.gyp:ui_java',
588 ], 588 ],
589 }], 589 }],
590 ['OS=="android" and use_aura==0', { 590 ['OS=="android" and use_aura==0', {
591 'sources!': [ 591 'sources!': [
592 'base/cursor/cursor_android.cc' 592 'base/cursor/cursor_android.cc'
593 ], 593 ],
594 }], 594 }],
595 ['OS=="android" and use_aura==1', {
596 'sources!': [
597 'base/clipboard/clipboard_aura.cc'
598 ],
599 }],
595 ['OS=="android" or OS=="ios"', { 600 ['OS=="android" or OS=="ios"', {
596 'sources!': [ 601 'sources!': [
597 'base/device_form_factor_desktop.cc' 602 'base/device_form_factor_desktop.cc'
598 ], 603 ],
599 }], 604 }],
600 ['OS=="linux"', { 605 ['OS=="linux"', {
601 'libraries': [ 606 'libraries': [
602 '-ldl', 607 '-ldl',
603 ], 608 ],
604 }], 609 }],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 'variables': { 641 'variables': {
637 'jni_gen_package': 'ui', 642 'jni_gen_package': 'ui',
638 'jni_generator_ptr_type': 'long', 643 'jni_generator_ptr_type': 'long',
639 }, 644 },
640 'includes': [ '../build/jni_generator.gypi' ], 645 'includes': [ '../build/jni_generator.gypi' ],
641 }, 646 },
642 ], 647 ],
643 }], 648 }],
644 ], 649 ],
645 } 650 }
OLDNEW
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698