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

Side by Side Diff: ui/base/ui_base.gyp

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 6 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 ], 656 ],
657 }], 657 }],
658 ['chromeos==0', { 658 ['chromeos==0', {
659 'sources!': [ 659 'sources!': [
660 'ime/input_method_chromeos.cc', 660 'ime/input_method_chromeos.cc',
661 'ime/input_method_chromeos.h', 661 'ime/input_method_chromeos.h',
662 ], 662 ],
663 }], 663 }],
664 ['chromeos==1', { 664 ['chromeos==1', {
665 'dependencies': [ 665 'dependencies': [
666 '../../chromeos/chromeos.gyp:chromeos', 666 '../chromeos/ui_chromeos.gyp:ui_chromeos_ime',
667 ], 667 ],
668 }], 668 }],
669 ['OS!="win"', { 669 ['OS!="win"', {
670 'sources!': [ 670 'sources!': [
671 'ime/input_method_imm32.cc', 671 'ime/input_method_imm32.cc',
672 'ime/input_method_imm32.h', 672 'ime/input_method_imm32.h',
673 ], 673 ],
674 }], 674 }],
675 ['use_aura==0 or (desktop_linux==0 and use_ozone==0)', { 675 ['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
676 'sources!': [ 676 'sources!': [
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 # to have sources that are built on iOS, the target should be changed 731 # to have sources that are built on iOS, the target should be changed
732 # to be of type static_library on all platforms. 732 # to be of type static_library on all platforms.
733 'type': 'none', 733 'type': 'none',
734 }], 734 }],
735 ['use_aura==1', { 735 ['use_aura==1', {
736 'sources!': [ 736 'sources!': [
737 'test/ui_controls_mac.mm', 737 'test/ui_controls_mac.mm',
738 'test/ui_controls_win.cc', 738 'test/ui_controls_win.cc',
739 ], 739 ],
740 }], 740 }],
741 ['chromeos == 1', {
742 'dependencies': [
743 '../chromeos/ui_chromeos.gyp:ui_chromeos_ime_test_support',
744 ],
745 }],
741 ], 746 ],
742 }, 747 },
743 ], 748 ],
744 'conditions': [ 749 'conditions': [
745 ['OS=="android"' , { 750 ['OS=="android"' , {
746 'targets': [ 751 'targets': [
747 { 752 {
748 # GN version: //ui/base:ui_base_jni_headers 753 # GN version: //ui/base:ui_base_jni_headers
749 'target_name': 'ui_base_jni_headers', 754 'target_name': 'ui_base_jni_headers',
750 'type': 'none', 755 'type': 'none',
(...skipping 10 matching lines...) Expand all
761 ], 766 ],
762 'variables': { 767 'variables': {
763 'jni_gen_package': 'ui', 768 'jni_gen_package': 'ui',
764 }, 769 },
765 'includes': [ '../../build/jni_generator.gypi' ], 770 'includes': [ '../../build/jni_generator.gypi' ],
766 }, 771 },
767 ], 772 ],
768 }], 773 }],
769 ], 774 ],
770 } 775 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698