summaryrefslogtreecommitdiffstats
path: root/.gn
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-08-05 16:54:52 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-05 23:55:41 +0000
commitad16cab0b66747137df714ff84c1338e352b7134 (patch)
tree3cc5df95f0db7c97d897402685d75febe5bf5345 /.gn
parent208c65020aecfcf305d524058f7ca89363a2d361 (diff)
downloadchromium_src-ad16cab0b66747137df714ff84c1338e352b7134.zip
chromium_src-ad16cab0b66747137df714ff84c1338e352b7134.tar.gz
chromium_src-ad16cab0b66747137df714ff84c1338e352b7134.tar.bz2
Revert of Straightens outs DEPS in mojo/common (patchset #5 id:80001 of https://codereview.chromium.org/1262173005/ )
Reason for revert: Broke MediaRouterMojoImplTest.QueuedWhileAsleep on linux debug. Original issue's description: > Straightens outs DEPS in mojo/common > > Prior to this change //mojo/environment depended upon //mojo/common. //mojo/common's deps are wrong and it needs to be depend upon various things in //third_party/mojo/src/mojo... When these DEPS are added link errors result because Environment and and a couple of other things need to be defined. These are defined in //mojo/environment. But //mojo/environment can't be a dep of //mojo/common, else we get a cycle. > > To straighten this out I've moved the files //mojo/environment needs from //mojo/common to //mojo/message_pump. //mojo/environment no longer depends upon //mojo/common, only //mojo/message_pump. //mojo/common can then depend upon //mojo/environment and we no longer have the cycle. Yay! > > BUG=none > TEST=none > > Committed: https://crrev.com/a11b4d76a27816fe025af647825becac5f633c34 > Cr-Commit-Position: refs/heads/master@{#341979} TBR=jam@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=none Review URL: https://codereview.chromium.org/1280463003 Cr-Commit-Position: refs/heads/master@{#342014}
Diffstat (limited to '.gn')
-rw-r--r--.gn5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gn b/.gn
index 3394e61..47da376 100644
--- a/.gn
+++ b/.gn
@@ -79,14 +79,15 @@ check_targets = [
"mojo/application/*",
"mojo/build/*",
"mojo/cc/*",
- "mojo/common/*",
+
+ # TODO(sky): resolve this.
+ # "mojo/common/*",
"mojo/converters/*",
"mojo/environment/*",
# TODO(sky): resolve this.
# "mojo/gles2/*",
"mojo/gpu/*",
- "mojo/message_pump/*",
"mojo/nacl/*",
# TODO(sky): resolve this.