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

Side by Side Diff: gyp/common.gypi

Issue 369683004: remove unneeded flags for android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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 | « no previous file | gyp/common_conditions.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 2011 The Android Open Source Project 1 # Copyright 2011 The Android Open Source Project
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 # This file is automatically included by gyp_skia when building any target. 6 # This file is automatically included by gyp_skia when building any target.
7 7
8 { 8 {
9 'includes': [ 9 'includes': [
10 'common_variables.gypi', 10 'common_variables.gypi',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ], 46 ],
47 }, 47 },
48 'includes': [ 48 'includes': [
49 'common_conditions.gypi', 49 'common_conditions.gypi',
50 ], 50 ],
51 'conditions': [ 51 'conditions': [
52 [ 'skia_scalar == "float"', 52 [ 'skia_scalar == "float"',
53 { 53 {
54 'defines': [ 54 'defines': [
55 'SK_SCALAR_IS_FLOAT', 55 'SK_SCALAR_IS_FLOAT',
56 'SK_CAN_USE_FLOAT',
57 ], 56 ],
58 }, { # else, skia_scalar != "float" 57 }, { # else, skia_scalar != "float"
59 'defines': [ 58 'defines': [
60 'SK_SCALAR_IS_FIXED', 59 'SK_SCALAR_IS_FIXED',
61 'SK_CAN_USE_FLOAT', # we can still use floats along the way
62 ], 60 ],
63 } 61 }
64 ], 62 ],
65 [ 'skia_mesa', { 63 [ 'skia_mesa', {
66 'defines': [ 64 'defines': [
67 'SK_MESA', 65 'SK_MESA',
68 ], 66 ],
69 'direct_dependent_settings': { 67 'direct_dependent_settings': {
70 'defines': [ 68 'defines': [
71 'SK_MESA', 69 'SK_MESA',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 'inherit_from': ['Release'], 107 'inherit_from': ['Release'],
110 'defines': [ 108 'defines': [
111 'SK_DEVELOPER=1', 109 'SK_DEVELOPER=1',
112 ], 110 ],
113 }, 111 },
114 }, 112 },
115 }], 113 }],
116 ], 114 ],
117 }, # end 'target_defaults' 115 }, # end 'target_defaults'
118 } 116 }
OLDNEW
« no previous file with comments | « no previous file | gyp/common_conditions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698