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

Side by Side Diff: gpu/gpu.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 | « gpu/command_buffer/command_buffer.gypi ('k') | gpu/gpu_config.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 (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 'variables': { 6 'variables': {
7 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 'command_buffer/tests/gl_test_utils.h', 290 'command_buffer/tests/gl_test_utils.h',
291 'command_buffer/tests/gl_tests_main.cc', 291 'command_buffer/tests/gl_tests_main.cc',
292 'command_buffer/tests/gl_texture_mailbox_unittests.cc', 292 'command_buffer/tests/gl_texture_mailbox_unittests.cc',
293 'command_buffer/tests/gl_texture_storage_unittests.cc', 293 'command_buffer/tests/gl_texture_storage_unittests.cc',
294 'command_buffer/tests/gl_unittests.cc', 294 'command_buffer/tests/gl_unittests.cc',
295 'command_buffer/tests/gl_unittests_android.cc', 295 'command_buffer/tests/gl_unittests_android.cc',
296 'command_buffer/tests/gl_virtual_contexts_unittests.cc', 296 'command_buffer/tests/gl_virtual_contexts_unittests.cc',
297 'command_buffer/tests/occlusion_query_unittests.cc', 297 'command_buffer/tests/occlusion_query_unittests.cc',
298 ], 298 ],
299 'conditions': [ 299 'conditions': [
300 ['OS == "android"', {
301 'link_settings': {
302 'libraries': [
303 '-landroid',
304 ],
305 },
306 }],
300 ['OS == "android" and gtest_target_type == "shared_library"', { 307 ['OS == "android" and gtest_target_type == "shared_library"', {
301 'dependencies': [ 308 'dependencies': [
302 '../testing/android/native_test.gyp:native_test_native_code', 309 '../testing/android/native_test.gyp:native_test_native_code',
303 ], 310 ],
304 }], 311 }],
305 ], 312 ],
306 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 313 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
307 'msvs_disabled_warnings': [ 4267, ], 314 'msvs_disabled_warnings': [ 4267, ],
308 }, 315 },
309 { 316 {
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 550 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
544 }, 551 },
545 'includes': [ 552 'includes': [
546 '../build/apk_test.gypi', 553 '../build/apk_test.gypi',
547 ], 554 ],
548 }, 555 },
549 ], 556 ],
550 }], 557 }],
551 ], 558 ],
552 } 559 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/command_buffer.gypi ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698