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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1653543002: Revert of Treat bad values passed to --images as a fatal error (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | « gyp/codec.gyp ('k') | gyp/common_variables.gypi » ('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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # conditions used in both common.gypi and skia.gyp in chromium 6 # conditions used in both common.gypi and skia.gyp in chromium
7 # 7 #
8 { 8 {
9 'defines': [ 9 'defines': [
10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
11 'SK_SUPPORT_GPU=<(skia_gpu)', 11 'SK_SUPPORT_GPU=<(skia_gpu)',
12 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 12 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
13 ], 13 ],
14 'conditions' : [ 14 'conditions' : [
15 [ 'skia_codec_decodes_raw', {
16 'defines': [
17 'SK_CODEC_DECODES_RAW',
18 ],
19 }],
20 ['skia_pic', { 15 ['skia_pic', {
21 'cflags': [ 16 'cflags': [
22 '-fPIC', 17 '-fPIC',
23 ], 18 ],
24 'conditions' : [ 19 'conditions' : [
25 # FIXME: The reason we don't do this on Android is due to the way 20 # FIXME: The reason we don't do this on Android is due to the way
26 # we build the executables/skia_launcher on Android. See 21 # we build the executables/skia_launcher on Android. See
27 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g ypi#newcode455 22 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g ypi#newcode455
28 ['skia_os != "android"', { 23 ['skia_os != "android"', {
29 'target_conditions': [ 24 'target_conditions': [
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], 683 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
689 }, 684 },
690 }], 685 }],
691 686
692 ], # end 'conditions' 687 ], # end 'conditions'
693 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 688 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
694 'xcode_settings': { 689 'xcode_settings': {
695 'SYMROOT': '<(DEPTH)/xcodebuild', 690 'SYMROOT': '<(DEPTH)/xcodebuild',
696 }, 691 },
697 } 692 }
OLDNEW
« no previous file with comments | « gyp/codec.gyp ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698