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

Side by Side Diff: ui/gfx/gfx.gyp

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 | « ui/events/events.gyp ('k') | ui/gl/gl.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 '<(DEPTH)/base/base.gyp:base_java', 345 '<(DEPTH)/base/base.gyp:base_java',
346 ], 346 ],
347 }], 347 }],
348 ['OS=="android" or OS=="ios"', { 348 ['OS=="android" or OS=="ios"', {
349 'sources!': [ 349 'sources!': [
350 'render_text.cc', 350 'render_text.cc',
351 'render_text.h', 351 'render_text.h',
352 'text_utils_skia.cc', 352 'text_utils_skia.cc',
353 ], 353 ],
354 }], 354 }],
355 ['OS=="mac"', {
356 'link_settings': {
357 'libraries': [
358 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
359 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
360 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
361 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
362 ],
363 },
364 }],
355 ['use_pango==1', { 365 ['use_pango==1', {
356 'dependencies': [ 366 'dependencies': [
357 '<(DEPTH)/build/linux/system.gyp:pangocairo', 367 '<(DEPTH)/build/linux/system.gyp:pangocairo',
358 ], 368 ],
359 }], 369 }],
360 ], 370 ],
361 'target_conditions': [ 371 'target_conditions': [
362 # Need 'target_conditions' to override default filename_rules to include 372 # Need 'target_conditions' to override default filename_rules to include
363 # the file on iOS. 373 # the file on iOS.
364 ['OS == "ios"', { 374 ['OS == "ios"', {
(...skipping 21 matching lines...) Expand all
386 ], 396 ],
387 'variables': { 397 'variables': {
388 'jni_gen_package': 'ui/gfx', 398 'jni_gen_package': 'ui/gfx',
389 }, 399 },
390 'includes': [ '../../build/jni_generator.gypi' ], 400 'includes': [ '../../build/jni_generator.gypi' ],
391 }, 401 },
392 ], 402 ],
393 }], 403 }],
394 ], 404 ],
395 } 405 }
OLDNEW
« no previous file with comments | « ui/events/events.gyp ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698