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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1085923002: Rename use_nss to use_nss_certs in gyp and grit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapping Created 5 years, 8 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') | 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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 '../components/autofill/content/renderer/test_password_autofill_agent.cc', 7 '../components/autofill/content/renderer/test_password_autofill_agent.cc',
8 '../components/autofill/content/renderer/test_password_autofill_agent.h', 8 '../components/autofill/content/renderer/test_password_autofill_agent.h',
9 '../components/autofill/content/renderer/test_password_generation_agent.cc ', 9 '../components/autofill/content/renderer/test_password_generation_agent.cc ',
10 '../components/autofill/content/renderer/test_password_generation_agent.h' , 10 '../components/autofill/content/renderer/test_password_generation_agent.h' ,
(...skipping 2555 matching lines...) Expand 10 before | Expand all | Expand 10 after
2566 '../ui/views/views.gyp:views_test_support', 2566 '../ui/views/views.gyp:views_test_support',
2567 ], 2567 ],
2568 'conditions': [ 2568 'conditions': [
2569 # TODO(tapted): Enable toolkit-views unit_tests on Mac when their 2569 # TODO(tapted): Enable toolkit-views unit_tests on Mac when their
2570 # respective implementations are linked in. http://crbug.com/412234. 2570 # respective implementations are linked in. http://crbug.com/412234.
2571 ['OS != "mac"', { 2571 ['OS != "mac"', {
2572 'sources': [ '<@(chrome_unit_tests_views_sources)' ], 2572 'sources': [ '<@(chrome_unit_tests_views_sources)' ],
2573 }], 2573 }],
2574 ], 2574 ],
2575 }], 2575 }],
2576 ['OS != "android" and (use_nss == 1 or use_openssl_certs == 1)', { 2576 ['OS != "android" and (use_nss_certs == 1 or use_openssl_certs == 1)', {
2577 'sources': [ 2577 'sources': [
2578 'common/net/x509_certificate_model_unittest.cc', 2578 'common/net/x509_certificate_model_unittest.cc',
2579 ], 2579 ],
2580 }], 2580 }],
2581 ['enable_supervised_users == 1', { 2581 ['enable_supervised_users == 1', {
2582 'sources': [ '<@(chrome_unit_tests_supervised_user_sources)' ], 2582 'sources': [ '<@(chrome_unit_tests_supervised_user_sources)' ],
2583 }], 2583 }],
2584 ['safe_browsing==1 and enable_extensions==1', { 2584 ['safe_browsing==1 and enable_extensions==1', {
2585 'sources': [ 2585 'sources': [
2586 'browser/extensions/blacklist_unittest.cc', 2586 'browser/extensions/blacklist_unittest.cc',
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
2777 'dependencies': [ 2777 'dependencies': [
2778 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2778 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2779 ], 2779 ],
2780 }], 2780 }],
2781 ], 2781 ],
2782 }, 2782 },
2783 ], 2783 ],
2784 }], 2784 }],
2785 ], # 'conditions' 2785 ], # 'conditions'
2786 } 2786 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698