diff options
author | sdefresne <sdefresne@chromium.org> | 2016-03-21 07:45:49 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 14:46:49 +0000 |
commit | bb3d6abbcdd5471561da7ea8da7740048e4b4a01 (patch) | |
tree | 19516605c5036de5431701ad25d5bb27eb1b1962 | |
parent | d0e42b4255f3fcda9ae5180b855e2b745a9763b1 (diff) | |
download | chromium_src-bb3d6abbcdd5471561da7ea8da7740048e4b4a01.zip chromium_src-bb3d6abbcdd5471561da7ea8da7740048e4b4a01.tar.gz chromium_src-bb3d6abbcdd5471561da7ea8da7740048e4b4a01.tar.bz2 |
[iOS] Define global assert_no_deps and use it to prevent regressions.
Define a global assert_no_deps on iOS (in ios/build/config.gni) and
use it in targets that have been fixed to work on iOS to prevent
further regression.
BUG=297668
Review URL: https://codereview.chromium.org/1812823002
Cr-Commit-Position: refs/heads/master@{#382286}
-rw-r--r-- | build/config/ios/rules.gni | 3 | ||||
-rw-r--r-- | components/BUILD.gn | 8 | ||||
-rw-r--r-- | ios/build/config.gni | 23 | ||||
-rw-r--r-- | ui/events/BUILD.gn | 8 |
4 files changed, 41 insertions, 1 deletions
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni index 93b8a17..87e7ff3 100644 --- a/build/config/ios/rules.gni +++ b/build/config/ios/rules.gni @@ -100,11 +100,12 @@ template("app") { forward_variables_from(invoker, "*", [ - "output_name", + "assert_no_deps", "code_signing_identity", "data_deps", "entitlements_path", "info_plist", + "output_name", "visibility", ]) diff --git a/components/BUILD.gn b/components/BUILD.gn index 67d9218..54f2799 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -11,6 +11,10 @@ if (is_android) { import("//build/config/android/rules.gni") } +if (is_ios) { + import("//ios/build/config.gni") +} + # To add a unit test to this target, make a "unit_test" source_set in your # component (it's important to use a source_set instead of a static library or # no tests will run) and add a reference here. You can add more than one unit @@ -264,6 +268,10 @@ test("components_unittests") { if (safe_browsing_mode == 2) { deps += [ "//components/safe_browsing_db:unit_tests_mobile" ] } + + if (is_ios) { + assert_no_deps = ios_assert_no_deps + } } repack("components_tests_pak") { diff --git a/ios/build/config.gni b/ios/build/config.gni new file mode 100644 index 0000000..6c11f94 --- /dev/null +++ b/ios/build/config.gni @@ -0,0 +1,23 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Global list of dependencies that are conceptually bad on iOS and should +# never be added (they will never be supported). +_ios_conceptually_bad_dependencies = [ + "//cc/*", + "//content/*", + "//dbus/*", + "//ipc/*", + "//jingle/*", + "//media/*", + "//third_party/webrtc/*", + "//third_party/WebKit/*", +] + +# Global list of conceptually fine dependencies but currently unsupported +# on iOS. exclusions will be removed when the dependencies are fixed. +_ios_transient_bad_dependencies = [ "//mojo/edk/*" ] + +ios_assert_no_deps = + _ios_conceptually_bad_dependencies + _ios_transient_bad_dependencies diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn index ecdf795..cc5ab08 100644 --- a/ui/events/BUILD.gn +++ b/ui/events/BUILD.gn @@ -10,6 +10,10 @@ if (is_android) { import("//build/config/android/rules.gni") } +if (is_ios) { + import("//ios/build/config.gni") +} + static_library("dom_keycode_converter") { sources = [ "keycodes/dom/dom_code.h", @@ -459,6 +463,10 @@ test("events_unittests") { if (is_android) { sources += [ "android/motion_event_android_unittest.cc" ] } + + if (is_ios) { + assert_no_deps = ios_assert_no_deps + } } if (is_android) { |