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

Side by Side Diff: Source/config.gni

Issue 323123004: Replace compile time guard with runtime flag in blink and remove ENABLE_FAST_MOBILE_SCROLLING in gy… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix gni file. Created 6 years, 6 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 | « Source/build/features.gypi ('k') | Source/core/rendering/RenderBoxModelObject.cpp » ('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 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 } else { 9 } else {
10 # TODO(brettw) remove this once && early-out is checked in. 10 # TODO(brettw) remove this once && early-out is checked in.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 # but we don't have that flag in the GN build yet. 58 # but we don't have that flag in the GN build yet.
59 feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ] 59 feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ]
60 } 60 }
61 61
62 if (use_concatenated_impulse_responses) { 62 if (use_concatenated_impulse_responses) {
63 feature_defines_list += [ "WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1" ] 63 feature_defines_list += [ "WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1" ]
64 } 64 }
65 65
66 if (is_android) { 66 if (is_android) {
67 feature_defines_list += [ 67 feature_defines_list += [
68 "ENABLE_FAST_MOBILE_SCROLLING=1",
69 "ENABLE_MEDIA_CAPTURE=1", 68 "ENABLE_MEDIA_CAPTURE=1",
70 ] 69 ]
71 } else { 70 } else {
72 feature_defines_list += [ 71 feature_defines_list += [
73 "ENABLE_INPUT_MULTIPLE_FIELDS_UI=1", 72 "ENABLE_INPUT_MULTIPLE_FIELDS_UI=1",
74 "ENABLE_MEDIA_CAPTURE=0", 73 "ENABLE_MEDIA_CAPTURE=0",
75 "ENABLE_WEB_AUDIO=1", 74 "ENABLE_WEB_AUDIO=1",
76 ] 75 ]
77 } 76 }
78 77
(...skipping 23 matching lines...) Expand all
102 } 101 }
103 102
104 # feature_defines_string ------------------------------------------------------- 103 # feature_defines_string -------------------------------------------------------
105 104
106 # Convert the list to a space-separated string for passing to scripts. 105 # Convert the list to a space-separated string for passing to scripts.
107 # This would be the equivalent of passing '<(feature_defines)' in GYP. 106 # This would be the equivalent of passing '<(feature_defines)' in GYP.
108 feature_defines_string = exec_script( 107 feature_defines_string = exec_script(
109 "build/gn_list_to_space_separated_string.py", 108 "build/gn_list_to_space_separated_string.py",
110 feature_defines_list, 109 feature_defines_list,
111 "trim string") 110 "trim string")
OLDNEW
« no previous file with comments | « Source/build/features.gypi ('k') | Source/core/rendering/RenderBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698