Skip to content

Commit

Permalink
Removed unused mojo_nacl code and GYP targets.
Browse files Browse the repository at this point in the history
There are subtle generated dependency issues breaking
several bots. The code is upstream in the Mojo repo
at this point and we have no need for the GYP targets
in the foreseeable future.

BUG=519643
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1279133006

Cr-Commit-Position: refs/heads/master@{#342920}
  • Loading branch information
krockot authored and Commit bot committed Aug 11, 2015
1 parent 63fbd48 commit 30011cd
Show file tree
Hide file tree
Showing 22 changed files with 0 additions and 1,695 deletions.
8 changes: 0 additions & 8 deletions build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,6 @@
'../components/nacl.gyp:nacl_helper_nonsfi_unittests',
],
}],
['disable_nacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../mojo/mojo_nacl_untrusted.gyp:libmojo',
'../mojo/mojo_nacl.gyp:monacl_codegen',
'../mojo/mojo_nacl.gyp:monacl_sel',
'../mojo/mojo_nacl.gyp:monacl_shell',
],
}],
],
}, # target_name: chromium_builder_tests
],
Expand Down
19 changes: 0 additions & 19 deletions build/gn_migration.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -28,7 +25,6 @@
'type': 'none',
'dependencies': [
'both_gn_and_gyp',
'gyp_only',
'gyp_remaining',
]
},
Expand Down Expand Up @@ -489,21 +485,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',
Expand Down
113 changes: 0 additions & 113 deletions mojo/mojo_nacl.gyp

This file was deleted.

84 changes: 0 additions & 84 deletions mojo/mojo_nacl_untrusted.gyp

This file was deleted.

105 changes: 0 additions & 105 deletions mojo/nacl/BUILD.gn

This file was deleted.

5 changes: 0 additions & 5 deletions mojo/nacl/DEPS

This file was deleted.

Loading

0 comments on commit 30011cd

Please sign in to comment.