Skip to content

Commit

Permalink
Stop //chrome/chrome_cleaner include_rules inheriting from //chrome
Browse files Browse the repository at this point in the history
chrome_cleaner is built into a separate executable from chrome, so many
of chrome's include_rules shouldn't apply to it.

Also moves several common dirs to chrome_cleaner's main DEPS file so they're
allowed in the whole chrome_cleaner project. The remaining includes that are
only allowed in some subdirs are:

* components/crx_file (only used in the component that unpacks CRX's)
* mojo/core/embedder (only used in IPC setup, and by some tests - mojo/public is allowed everywhere)
* net/traffic_annotation (only used in networking code)
* third_party/crashpad (only used in the crash reporter)
* third_party/zlib (only used in the unpacker component and zip_archiver)

R=proberge

Bug: 967728
Change-Id: I96dc59014ebb9be0e0483a190e000f42902b49da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1749249
Reviewed-by: proberge <proberge@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@google.com>
Cr-Commit-Position: refs/heads/master@{#686468}
  • Loading branch information
JoeNotCharlesGoogle authored and Commit Bot committed Aug 13, 2019
1 parent 29d3361 commit 05ada90
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 25 deletions.
9 changes: 9 additions & 0 deletions chrome/chrome_cleaner/DEPS
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# chrome_cleaner is built into a separate executable and should not inherit
# rules from chromium.
noparent = True

include_rules = [
"+base",
"+components/chrome_cleaner",
"+crypto",
"+mojo/public",
"+sandbox/win/src",
"+testing",
"+third_party/protobuf/src/google/protobuf",
"+url",
]
3 changes: 0 additions & 3 deletions chrome/chrome_cleaner/chrome_utils/DEPS

This file was deleted.

3 changes: 0 additions & 3 deletions chrome/chrome_cleaner/cleaner/DEPS

This file was deleted.

3 changes: 0 additions & 3 deletions chrome/chrome_cleaner/engines/DEPS

This file was deleted.

1 change: 0 additions & 1 deletion chrome/chrome_cleaner/ipc/DEPS
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include_rules = [
"+mojo/core/embedder",
"+mojo/public/cpp",
]
1 change: 0 additions & 1 deletion chrome/chrome_cleaner/logging/DEPS
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include_rules = [
"+net/traffic_annotation",
"+url",
]
5 changes: 0 additions & 5 deletions chrome/chrome_cleaner/mojom/typemaps/DEPS
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
include_rules = [
# Allow the typemaps to access their dependencies.
'+mojo/public/cpp/bindings',
'+mojo/public/cpp/base',
'+mojo/public/cpp/system/platform_handle.h',

# Allow unit tests to set up a mojo embedder.
'+mojo/core/embedder',
]
3 changes: 0 additions & 3 deletions chrome/chrome_cleaner/os/DEPS

This file was deleted.

3 changes: 0 additions & 3 deletions chrome/chrome_cleaner/parsers/DEPS

This file was deleted.

3 changes: 0 additions & 3 deletions chrome/chrome_cleaner/settings/DEPS

This file was deleted.

0 comments on commit 05ada90

Please sign in to comment.