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

Unified Diff: build/gn_migration.gypi

Issue 1041163004: Add a 'gyp_only' GYP target for the GN migration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@performance_browser_tests
Patch Set: merge to #323155 Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 6201bd7dec36e741e9c22c86ad1eaecd002bb32a..33ded5c32f4f8a15380cb2269d40246fc498944c 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -68,7 +68,6 @@
'../components/components_tests.gyp:components_browsertests',
'../components/components_tests.gyp:components_perftests',
'../components/components_tests.gyp:components_unittests',
- '../components/nacl.gyp:nacl_loader_unittests',
'../content/content.gyp:content_app_browser',
'../content/content.gyp:content_app_child',
'../content/content_shell_and_tests.gyp:content_browsertests',
@@ -188,6 +187,11 @@
'../components/components.gyp:session_manager_component',
],
}],
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '../components/nacl.gyp:nacl_loader_unittests',
+ ]
+ }],
['enable_extensions==1 and OS!="mac"', {
'dependencies': [
'../extensions/shell/app_shell.gyp:app_shell',
@@ -412,6 +416,21 @@
],
},
{
+ 'target_name': 'gyp_only',
+ 'type': 'none',
+ 'conditions': [
+ ['OS=="linux"', {
+ 'conditions': [
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '../mojo/mojo_nacl.gyp:monacl_shell', # This should not be built in chromium.
+ ]
+ }],
+ ]
+ }],
+ ],
+ },
+ {
'target_name': 'gyp_remaining',
'type': 'none',
'conditions': [
@@ -425,12 +444,6 @@
'../ppapi/ppapi_internal.gyp:*',
],
'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
- 'dependencies': [
- '../mojo/mojo_nacl.gyp:monacl_shell', # TODO(GYP) This will be deleted; don't port
- '../remoting/remoting.gyp:remoting_key_tester',
- ]
- }],
['remoting==1', {
'dependencies': [
'../remoting/app_remoting_webapp.gyp:ar_sample_app',
@@ -442,6 +455,13 @@
'../remoting/remoting.gyp:remoting_perftests',
'../remoting/remoting.gyp:remoting_start_host',
],
+ 'conditions': [
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '../remoting/remoting.gyp:remoting_key_tester',
+ ]
+ }],
+ ],
}],
['test_isolation_mode!="noop"', {
'dependencies': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698