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

Side by Side Diff: components/components_tests.gyp

Issue 912503003: Remove "nacl_defines" from the GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « chrome/chrome_browser_ui.gypi ('k') | components/nacl.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 ], 578 ],
579 'conditions': [ 579 'conditions': [
580 ['configuration_policy==1', { 580 ['configuration_policy==1', {
581 'sources/': [ 581 'sources/': [
582 ['include', '^policy/'], 582 ['include', '^policy/'],
583 ], 583 ],
584 }], 584 }],
585 ], 585 ],
586 }], 586 }],
587 ['disable_nacl==0', { 587 ['disable_nacl==0', {
588 'includes': [
589 'nacl/nacl_defines.gypi',
590 ],
591 'defines': [
592 '<@(nacl_defines)',
593 ],
594 'sources': [ 588 'sources': [
595 'nacl/browser/nacl_file_host_unittest.cc', 589 'nacl/browser/nacl_file_host_unittest.cc',
596 'nacl/browser/nacl_process_host_unittest.cc', 590 'nacl/browser/nacl_process_host_unittest.cc',
597 'nacl/browser/nacl_validation_cache_unittest.cc', 591 'nacl/browser/nacl_validation_cache_unittest.cc',
598 'nacl/browser/pnacl_host_unittest.cc', 592 'nacl/browser/pnacl_host_unittest.cc',
599 'nacl/browser/pnacl_translation_cache_unittest.cc', 593 'nacl/browser/pnacl_translation_cache_unittest.cc',
600 'nacl/browser/test_nacl_browser_delegate.cc', 594 'nacl/browser/test_nacl_browser_delegate.cc',
601 'nacl/zygote/nacl_fork_delegate_linux_unittest.cc', 595 'nacl/zygote/nacl_fork_delegate_linux_unittest.cc',
602 ], 596 ],
603 'dependencies': [ 597 'dependencies': [
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 '../build/isolate.gypi', 1054 '../build/isolate.gypi',
1061 ], 1055 ],
1062 'sources': [ 1056 'sources': [
1063 'components_unittests.isolate', 1057 'components_unittests.isolate',
1064 ], 1058 ],
1065 }, 1059 },
1066 ], 1060 ],
1067 }], 1061 }],
1068 ], 1062 ],
1069 } 1063 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698