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

Side by Side Diff: gpu/command_buffer/command_buffer.gypi

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « crypto/crypto.gyp ('k') | gpu/gpu.gyp » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'gles2_utils_target': 0, 8 'gles2_utils_target': 0,
9 }, 9 },
10 'conditions': [
11 ['OS=="android"', {
12 'link_settings': {
13 'libraries': [
14 '-llog',
15 ],
16 },
17 }],
18 ],
10 'target_conditions': [ 19 'target_conditions': [
11 # This part is shared between the targets defined below. 20 # This part is shared between the targets defined below.
12 ['gles2_utils_target==1', { 21 ['gles2_utils_target==1', {
13 'defines': [ 22 'defines': [
14 'GLES2_UTILS_IMPLEMENTATION', 23 'GLES2_UTILS_IMPLEMENTATION',
15 ], 24 ],
16 'sources': [ 25 'sources': [
17 'common/gles2_cmd_format.h', 26 'common/gles2_cmd_format.h',
18 'common/gles2_cmd_utils.cc', 27 'common/gles2_cmd_utils.cc',
19 'common/gles2_cmd_utils.h', 28 'common/gles2_cmd_utils.h',
20 'common/gles2_utils_export.h', 29 'common/gles2_utils_export.h',
21 'common/logging.cc', 30 'common/logging.cc',
22 'common/logging.h', 31 'common/logging.h',
23 ], 32 ],
24 'conditions': [ 33 'conditions': [
25 ['OS=="android"', { 34 ['OS=="android"', {
26 'sources!': [ 35 'sources!': [
27 'common/logging.cc', 36 'common/logging.cc',
28 ], 37 ],
29 'sources': [ 38 'sources': [
30 'common/logging_android.cc', 39 'common/logging_android.cc',
31 ], 40 ],
32 }], 41 }],
33 ], 42 ],
34 }], 43 }],
35 ], 44 ],
36 }, 45 },
37 } 46 }
OLDNEW
« no previous file with comments | « crypto/crypto.gyp ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698