Skip to content

Commit

Permalink
[ios] Updates ios DEPS files to mirror desktop DEPS files.
Browse files Browse the repository at this point in the history
Updates ios DEPS files to mirror the desktop DEPS files.  For example, the rules
in ios/DEPS roughly resemble the rules in DEPS, and the rules in ios/chrome/DEPS
roughly resemble the rules in chrome/DEPS.

Also adds some new rules to accomodate iOS code that will be landing in the near
future.

BUG=665969

Review-Url: https://codereview.chromium.org/2541083002
Cr-Commit-Position: refs/heads/master@{#436313}
  • Loading branch information
rohitrao authored and Commit bot committed Dec 5, 2016
1 parent dff0384 commit 098884e
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 10 deletions.
8 changes: 5 additions & 3 deletions ios/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ include_rules = [
# directories in ios/ so we disallow all of them.
"-ios",

# To avoid ODR violation, direct import of ios/third_party/ochamcrest
# is forbidden in ios/DEPS and code should instead use import as if
# OCHamcrest was in a framework (i.e. #import <OCHamcrest/OCHamcrest.h>).
# To avoid ODR violation, direct import of these libraries is forbidden in
# ios/DEPS and code should instead use import as if they were in a framework
# (i.e. #import <OCHamcrest/OCHamcrest.h>).
"-ios/third_party/earl_grey",
"-ios/third_party/ochamcrest",

# For unit tests.
"+ios/testing",
"+third_party/ocmock",
]
15 changes: 15 additions & 0 deletions ios/chrome/DEPS
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
include_rules = [
"+crypto",
"+net",
"+sql",
"+ui/base",
"+ui/gfx",

# Only parts of skia are compiled on iOS, so we explicitly list the
# files that can be included to avoid bringing in more code.
"+skia/ext/skia_utils_ios.h",
"+third_party/skia/include/core/SkBitmap.h",
"+third_party/skia/include/core/SkColor.h",
"+third_party/skia/include/core/SkGraphics.h",

# The subdirectories in ios/chrome/ will manually allow their own include
# directories in ios/chrome/ so we disallow all of them.
"-ios/chrome",
"+ios/chrome/common",
"+ios/chrome/test",
]
22 changes: 22 additions & 0 deletions ios/chrome/app/DEPS
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
include_rules = [
"+ios/chrome/browser",

"+breakpad/src/client/ios",
"+components/bookmarks/browser",
"+components/bookmarks/test",
"+components/browser_sync",
"+components/browsing_data/core",
"+components/component_updater",
"+components/content_settings",
"+components/crash/core/common",
"+components/favicon/core",
"+components/favicon_base",
"+components/handoff",
"+components/history/core/browser",
"+components/metrics",
"+components/prefs",
"+components/reading_list/core",
"+components/signin/core/browser",
"+components/strings",
"+components/suggestions",
"+components/url_formatter",
"+components/web_resource",
"+mojo/edk/embedder/embedder.h",
]
12 changes: 5 additions & 7 deletions ios/chrome/browser/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ include_rules = [
"+components/crash/core/common",
"+components/dom_distiller/core",
"+components/dom_distiller/ios",
"+components/error_page/common",
"+components/favicon/core",
"+components/favicon/ios",
"+components/favicon_base",
"+components/flags_ui",
"+components/gcm_driver",
Expand Down Expand Up @@ -51,6 +53,7 @@ include_rules = [
"+components/prefs",
"+components/profile_metrics",
"+components/proxy_config",
"+components/query_parser",
"+components/rappor",
"+components/reading_list",
"+components/rlz",
Expand All @@ -64,11 +67,13 @@ include_rules = [
"+components/signin/core/common",
"+components/signin/ios/browser",
"+components/ssl_config",
"+components/ssl_errors",
"+components/suggestions",
"+components/sync",
"+components/sync_sessions",
"+components/sync_preferences",
"+components/task_scheduler_util",
"+components/toolbar",
"+components/translate/core",
"+components/translate/ios",
"+components/undo",
Expand All @@ -83,7 +88,6 @@ include_rules = [
"+components/webp_transcode",
"+crypto",
"+google_apis",
"+ios/chrome/common",
"+ios/net",
"+ios/public/provider/chrome",
"+ios/public/provider/components",
Expand All @@ -101,12 +105,6 @@ include_rules = [
# For tests.
"+ios/chrome/test",
"+ios/public/test",
"+ios/testing",

# Only parts of skia are compiled on iOS, so we explicitly list the
# files that can be included to avoid bringing in more code.
"+skia/ext/skia_utils_ios.h",
"+third_party/skia/include/core/SkBitmap.h",

# Strings and resources.
"+components/grit",
Expand Down

0 comments on commit 098884e

Please sign in to comment.