Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1237)

Unified Diff: mojo/edk/mojo_edk.gni

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/mojo_edk.gni
diff --git a/third_party/mojo/src/mojo/edk/mojo_edk.gni b/mojo/edk/mojo_edk.gni
similarity index 61%
copy from third_party/mojo/src/mojo/edk/mojo_edk.gni
copy to mojo/edk/mojo_edk.gni
index 21ad315a96af5baa5633da398007f87e850b57f9..efb2a5f46def6a7cb113b7e8f0ff6ade280351ba 100644
--- a/third_party/mojo/src/mojo/edk/mojo_edk.gni
+++ b/mojo/edk/mojo_edk.gni
@@ -2,20 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("../public/mojo_sdk.gni")
+import("../../third_party/mojo/src/mojo/public/mojo_sdk.gni")
# A mojo_edk_source_set is a mojo_sdk_source_set that does not restrict
# external dependencies and understands the following additional variables, all
# of which admit a list of the relevant elements specified relative to the
# location of the Mojo EDK:
-# mojo_edk_configs
# allow_circular_mojo_edk_includes_from
-# mojo_edk_public_deps
-# mojo_edk_deps
-
-# Note that it is assumed that the Mojo EDK is a sibling of the Mojo SDK in a
-# client repo; the distinctions made above are for the sake of clarity in
-# writing targets.
template("mojo_edk_source_set") {
mojo_sdk_source_set(target_name) {
if (defined(invoker.public_deps) || defined(invoker.deps)) {
@@ -25,9 +18,6 @@ template("mojo_edk_source_set") {
if (defined(invoker.visibility)) {
visibility = invoker.visibility
}
- if (defined(invoker.mojo_edk_visibility)) {
- mojo_sdk_visibility = invoker.mojo_edk_visibility
- }
if (defined(invoker.testonly)) {
testonly = invoker.testonly
}
@@ -45,14 +35,6 @@ template("mojo_edk_source_set") {
if (defined(invoker.configs)) {
configs = invoker.configs
}
- if (defined(invoker.mojo_edk_configs)) {
- foreach(edk_config, invoker.mojo_edk_configs) {
- # Check that the EDK config was not mistakenly given as an absolute
- # path.
- assert(get_path_info(edk_config, "abspath") != edk_config)
- configs += [ rebase_path(edk_config, ".", mojo_root) ]
- }
- }
allow_circular_includes_from = []
if (defined(invoker.allow_circular_includes_from)) {
@@ -72,11 +54,6 @@ template("mojo_edk_source_set") {
public_deps = invoker.public_deps
}
mojo_sdk_public_deps = []
- if (defined(invoker.mojo_edk_public_deps)) {
- # The EDK is required to be a sibling of the SDK, so the relative
- # dependencies are rewritten in the same way.
- mojo_sdk_public_deps = invoker.mojo_edk_public_deps
- }
if (defined(invoker.mojo_sdk_public_deps)) {
mojo_sdk_public_deps += invoker.mojo_sdk_public_deps
}
@@ -85,19 +62,8 @@ template("mojo_edk_source_set") {
deps = invoker.deps
}
mojo_sdk_deps = []
- if (defined(invoker.mojo_edk_deps)) {
- # The EDK is required to be a sibling of the SDK, so the relative
- # dependencies are rewritten in the same way.
- mojo_sdk_deps = invoker.mojo_edk_deps
- }
if (defined(invoker.mojo_sdk_deps)) {
mojo_sdk_deps += invoker.mojo_sdk_deps
}
}
}
-
-# Build EDK things with static thread annotation analysis enabled.
-# TODO(vtl): Should we set this at a higher level?
-if (is_clang) {
- cflags = [ "-Wthread-safety" ]
-}

Powered by Google App Engine
This is Rietveld 408576698