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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1520403003: Prototype of RAW decoding in Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments Created 4 years, 11 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
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', {
scroggo 2016/01/11 17:44:02 This seems fine. I think you could have left this
yujieqin 2016/01/12 10:47:40 Sure thing, I moved this back to the codec.gyp. We
16 'defines': [
17 'SK_CODEC_DECODES_RAW',
18 ],
19 }
20 ],
15 ['skia_pic', { 21 ['skia_pic', {
16 'cflags': [ 22 'cflags': [
17 '-fPIC', 23 '-fPIC',
18 ], 24 ],
19 'conditions' : [ 25 'conditions' : [
20 # FIXME: The reason we don't do this on Android is due to the way 26 # FIXME: The reason we don't do this on Android is due to the way
21 # we build the executables/skia_launcher on Android. See 27 # we build the executables/skia_launcher on Android. See
22 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g ypi#newcode455 28 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g ypi#newcode455
23 ['skia_os != "android"', { 29 ['skia_os != "android"', {
24 'target_conditions': [ 30 'target_conditions': [
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], 666 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
661 }, 667 },
662 }], 668 }],
663 669
664 ], # end 'conditions' 670 ], # end 'conditions'
665 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 671 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
666 'xcode_settings': { 672 'xcode_settings': {
667 'SYMROOT': '<(DEPTH)/xcodebuild', 673 'SYMROOT': '<(DEPTH)/xcodebuild',
668 }, 674 },
669 } 675 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698