Commit 098884e1 authored by rohitrao's avatar rohitrao Committed by Commit bot

[ios] Updates ios DEPS files to mirror desktop DEPS files.

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}
parent dff0384e
...@@ -3,11 +3,13 @@ include_rules = [ ...@@ -3,11 +3,13 @@ include_rules = [
# directories in ios/ so we disallow all of them. # directories in ios/ so we disallow all of them.
"-ios", "-ios",
# To avoid ODR violation, direct import of ios/third_party/ochamcrest # To avoid ODR violation, direct import of these libraries is forbidden in
# is forbidden in ios/DEPS and code should instead use import as if # ios/DEPS and code should instead use import as if they were in a framework
# OCHamcrest was in a framework (i.e. #import <OCHamcrest/OCHamcrest.h>). # (i.e. #import <OCHamcrest/OCHamcrest.h>).
"-ios/third_party/earl_grey",
"-ios/third_party/ochamcrest", "-ios/third_party/ochamcrest",
# For unit tests. # For unit tests.
"+ios/testing",
"+third_party/ocmock", "+third_party/ocmock",
] ]
include_rules = [ 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 # The subdirectories in ios/chrome/ will manually allow their own include
# directories in ios/chrome/ so we disallow all of them. # directories in ios/chrome/ so we disallow all of them.
"-ios/chrome", "-ios/chrome",
"+ios/chrome/common",
"+ios/chrome/test",
] ]
include_rules = [ include_rules = [
"+ios/chrome/browser", "+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",
] ]
...@@ -15,7 +15,9 @@ include_rules = [ ...@@ -15,7 +15,9 @@ include_rules = [
"+components/crash/core/common", "+components/crash/core/common",
"+components/dom_distiller/core", "+components/dom_distiller/core",
"+components/dom_distiller/ios", "+components/dom_distiller/ios",
"+components/error_page/common",
"+components/favicon/core", "+components/favicon/core",
"+components/favicon/ios",
"+components/favicon_base", "+components/favicon_base",
"+components/flags_ui", "+components/flags_ui",
"+components/gcm_driver", "+components/gcm_driver",
...@@ -51,6 +53,7 @@ include_rules = [ ...@@ -51,6 +53,7 @@ include_rules = [
"+components/prefs", "+components/prefs",
"+components/profile_metrics", "+components/profile_metrics",
"+components/proxy_config", "+components/proxy_config",
"+components/query_parser",
"+components/rappor", "+components/rappor",
"+components/reading_list", "+components/reading_list",
"+components/rlz", "+components/rlz",
...@@ -64,11 +67,13 @@ include_rules = [ ...@@ -64,11 +67,13 @@ include_rules = [
"+components/signin/core/common", "+components/signin/core/common",
"+components/signin/ios/browser", "+components/signin/ios/browser",
"+components/ssl_config", "+components/ssl_config",
"+components/ssl_errors",
"+components/suggestions", "+components/suggestions",
"+components/sync", "+components/sync",
"+components/sync_sessions", "+components/sync_sessions",
"+components/sync_preferences", "+components/sync_preferences",
"+components/task_scheduler_util", "+components/task_scheduler_util",
"+components/toolbar",
"+components/translate/core", "+components/translate/core",
"+components/translate/ios", "+components/translate/ios",
"+components/undo", "+components/undo",
...@@ -83,7 +88,6 @@ include_rules = [ ...@@ -83,7 +88,6 @@ include_rules = [
"+components/webp_transcode", "+components/webp_transcode",
"+crypto", "+crypto",
"+google_apis", "+google_apis",
"+ios/chrome/common",
"+ios/net", "+ios/net",
"+ios/public/provider/chrome", "+ios/public/provider/chrome",
"+ios/public/provider/components", "+ios/public/provider/components",
...@@ -101,12 +105,6 @@ include_rules = [ ...@@ -101,12 +105,6 @@ include_rules = [
# For tests. # For tests.
"+ios/chrome/test", "+ios/chrome/test",
"+ios/public/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. # Strings and resources.
"+components/grit", "+components/grit",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment