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

Side by Side Diff: Source/config.gni

Issue 864723003: Made blink gyps and gns to public oilpan configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing (fix android build failure) Created 5 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 | « Source/build/features.gypi ('k') | public/BUILD.gn » ('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 import("//third_party/WebKit/public/features.gni") 6 import("//third_party/WebKit/public/features.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 } else { 10 } else {
(...skipping 28 matching lines...) Expand all
39 cpu_arch == "x64" || 39 cpu_arch == "x64" ||
40 (cpu_arch == "arm" && arm_version >= 7)) 40 (cpu_arch == "arm" && arm_version >= 7))
41 41
42 use_webaudio_ffmpeg = !is_mac && !is_android 42 use_webaudio_ffmpeg = !is_mac && !is_android
43 43
44 # Set this to true to enable use of concatenated impulse responses for the HRTF 44 # Set this to true to enable use of concatenated impulse responses for the HRTF
45 # panner in WebAudio. 45 # panner in WebAudio.
46 # TODO(brettw) do we need this or can we assume its always on? 46 # TODO(brettw) do we need this or can we assume its always on?
47 use_concatenated_impulse_responses = true 47 use_concatenated_impulse_responses = true
48 48
49 # public_feature_defines_list --------------------------------------------------
50
51 public_feature_defines_list = []
52
53 if (enable_oilpan) {
54 public_feature_defines_list += [ "ENABLE_OILPAN=1" ]
55 }
56
49 # feature_defines_list --------------------------------------------------------- 57 # feature_defines_list ---------------------------------------------------------
50 58
51 feature_defines_list = [ 59 feature_defines_list = [
52 "ENABLE_OPENTYPE_VERTICAL=1" 60 "ENABLE_OPENTYPE_VERTICAL=1"
53 ] 61 ]
54 62
55 if (is_debug) { 63 if (is_debug) {
56 # TODO(GYP) this should also be set when release_valgrind_build is set, 64 # TODO(GYP) this should also be set when release_valgrind_build is set,
57 # but we don't have that flag in the GN build yet. 65 # but we don't have that flag in the GN build yet.
58 feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ] 66 feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ]
(...skipping 19 matching lines...) Expand all
78 "WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1", 86 "WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1",
79 # Enabling the FFT is enough to enable WebAudio support to 87 # Enabling the FFT is enough to enable WebAudio support to
80 # allow most WebAudio features to work on Android. 88 # allow most WebAudio features to work on Android.
81 "ENABLE_WEB_AUDIO=1", 89 "ENABLE_WEB_AUDIO=1",
82 ] 90 ]
83 } 91 }
84 92
85 if (use_default_render_theme) { 93 if (use_default_render_theme) {
86 feature_defines_list += [ "WTF_USE_DEFAULT_RENDER_THEME=1" ] 94 feature_defines_list += [ "WTF_USE_DEFAULT_RENDER_THEME=1" ]
87 } 95 }
88 if (enable_oilpan) {
89 feature_defines_list += [ "ENABLE_OILPAN=1" ]
90 }
91 if (blink_asserts_always_on) { 96 if (blink_asserts_always_on) {
92 feature_defines_list += [ "ENABLE_ASSERT=1" ] 97 feature_defines_list += [ "ENABLE_ASSERT=1" ]
93 } 98 }
94 99
95 # feature_defines_string ------------------------------------------------------- 100 # feature_defines_string -------------------------------------------------------
96 101
97 # Convert the list to a space-separated string for passing to scripts. 102 # Convert the list to a space-separated string for passing to scripts.
98 # This would be the equivalent of passing '<(feature_defines)' in GYP. 103 # This would be the equivalent of passing '<(feature_defines)' in GYP.
99 feature_defines_string = exec_script( 104 feature_defines_string = exec_script(
100 "build/gn_list_to_space_separated_string.py", 105 "build/gn_list_to_space_separated_string.py",
101 feature_defines_list, 106 feature_defines_list,
102 "trim string") 107 "trim string")
OLDNEW
« no previous file with comments | « Source/build/features.gypi ('k') | public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698