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

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

Issue 1719343002: Move ENABLE_HIDPI to new build flags system (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 10 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/resource/resource_bundle.cc ('k') | ui/base/ui_features.gni » ('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 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 23 matching lines...) Expand all
34 'defines': [ 34 'defines': [
35 'UI_DATA_PACK_IMPLEMENTATION', 35 'UI_DATA_PACK_IMPLEMENTATION',
36 ], 36 ],
37 'conditions': [ 37 'conditions': [
38 ['OS=="win"', { 38 ['OS=="win"', {
39 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 39 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
40 'msvs_disabled_warnings': [ 4267 ], 40 'msvs_disabled_warnings': [ 4267 ],
41 }], 41 }],
42 ], 42 ],
43 }, 43 },
44 { # GN version: //ui/base:ui_features
45 'target_name': 'ui_features',
46 'includes': [ '../../build/buildflag_header.gypi' ],
47 'variables': {
48 'buildflag_header_path': 'ui/base/ui_features.h',
49 'buildflag_flags': [
50 'ENABLE_HIDPI=<(enable_hidpi)',
51 ],
52 },
53 },
44 { 54 {
45 # GN version: //ui/base 55 # GN version: //ui/base
46 'target_name': 'ui_base', 56 'target_name': 'ui_base',
47 'type': '<(component)', 57 'type': '<(component)',
48 'dependencies': [ 58 'dependencies': [
49 'ui_data_pack', 59 'ui_data_pack',
60 'ui_features',
50 '../../base/base.gyp:base', 61 '../../base/base.gyp:base',
51 '../../base/base.gyp:base_i18n', 62 '../../base/base.gyp:base_i18n',
52 '../../base/base.gyp:base_static', 63 '../../base/base.gyp:base_static',
53 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 64 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
54 '../../net/net.gyp:net', 65 '../../net/net.gyp:net',
55 '../../skia/skia.gyp:skia', 66 '../../skia/skia.gyp:skia',
56 '../../third_party/icu/icu.gyp:icui18n', 67 '../../third_party/icu/icu.gyp:icui18n',
57 '../../third_party/icu/icu.gyp:icuuc', 68 '../../third_party/icu/icu.gyp:icuuc',
58 '../../url/url.gyp:url_lib', 69 '../../url/url.gyp:url_lib',
59 '../events/events.gyp:events', 70 '../events/events.gyp:events',
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 ], 771 ],
761 'variables': { 772 'variables': {
762 'jni_gen_package': 'ui', 773 'jni_gen_package': 'ui',
763 }, 774 },
764 'includes': [ '../../build/jni_generator.gypi' ], 775 'includes': [ '../../build/jni_generator.gypi' ],
765 }, 776 },
766 ], 777 ],
767 }], 778 }],
768 ], 779 ],
769 } 780 }
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/ui_features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698