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

Unified Diff: build/gn_migration.gypi

Issue 1279133006: Removed unused mojo_nacl code and GYP targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: - -l Created 5 years, 4 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 | « build/all.gyp ('k') | mojo/mojo_nacl.gyp » ('j') | 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 5e7dc7f73e161fa563dc7fe6931d5c9875070496..55b63e2c5fbf4bc5b19c86def0825e81ae5648b1 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -12,9 +12,6 @@
# type 'ninja gyp_all' and then 'ninja all', the second build should do
# nothing. 'gyp_all' should just depend on the other four targets.
#
-# 'gyp_only' lists any targets that are not meant to be ported over to the GN
-# build.
-#
# 'gyp_remaining' lists all of the targets that still need to be converted,
# i.e., all of the other (non-empty) targets that a GYP build will build.
#
@@ -28,7 +25,6 @@
'type': 'none',
'dependencies': [
'both_gn_and_gyp',
- 'gyp_only',
'gyp_remaining',
]
},
@@ -490,21 +486,6 @@
],
},
{
- 'target_name': 'gyp_only',
- 'type': 'none',
- 'conditions': [
- ['OS=="linux" or OS=="win"', {
- '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': [
« no previous file with comments | « build/all.gyp ('k') | mojo/mojo_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698