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

Side by Side Diff: content/content_tests.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 | « content/content_shell.gypi ('k') | crypto/crypto.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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 'test/cpp_binding_example.h', 936 'test/cpp_binding_example.h',
937 'test/webui_resource_browsertest.cc', 937 'test/webui_resource_browsertest.cc',
938 ], 938 ],
939 'conditions': [ 939 'conditions': [
940 ['chromeos==0', { 940 ['chromeos==0', {
941 'sources!': [ 941 'sources!': [
942 'browser/web_contents/touch_editable_impl_aura_browsertest.cc', 942 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
943 ], 943 ],
944 }], 944 }],
945 ['OS=="win"', { 945 ['OS=="win"', {
946 'link_settings': {
947 'libraries': [
948 '-loleacc.lib',
949 ],
950 },
946 'resource_include_dirs': [ 951 'resource_include_dirs': [
947 '<(SHARED_INTERMEDIATE_DIR)/webkit', 952 '<(SHARED_INTERMEDIATE_DIR)/webkit',
948 ], 953 ],
949 'sources': [ 954 'sources': [
950 'shell/app/resource.h', 955 'shell/app/resource.h',
951 'shell/app/shell.rc', 956 'shell/app/shell.rc',
952 # TODO: It would be nice to have these pulled in 957 # TODO: It would be nice to have these pulled in
953 # automatically from direct_dependent_settings in 958 # automatically from direct_dependent_settings in
954 # their various targets (net.gyp:net_resources, etc.), 959 # their various targets (net.gyp:net_resources, etc.),
955 # but that causes errors in other targets when 960 # but that causes errors in other targets when
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1504 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1500 }, 1505 },
1501 ], 1506 ],
1502 }], 1507 }],
1503 ], 1508 ],
1504 }, 1509 },
1505 ], 1510 ],
1506 }], 1511 }],
1507 ], 1512 ],
1508 } 1513 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698