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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_public.gyp

Issue 2036683002: [iOS] Remove dependency third_party/WebKit on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment explaining why target are conditionally defined Created 4 years, 6 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/config.gyp » ('j') | third_party/WebKit/Source/config.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public.gyp
diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
index 7096de5e890f78561e7431e15d6968ab1d10d683..d6a5ab21deed2ee2dadc69986b9c5992b2afaa68 100644
--- a/mojo/mojo_public.gyp
+++ b/mojo/mojo_public.gyp
@@ -238,36 +238,6 @@
],
},
{
- # GN version: //mojo/public/cpp/bindings:wtf_support
- 'target_name': 'mojo_cpp_bindings_wtf_support',
- 'type': 'static_library',
- 'include_dirs': [
- '..'
- ],
- 'sources': [
- 'public/cpp/bindings/array_traits_wtf.h',
- 'public/cpp/bindings/array_traits_wtf_vector.h',
- 'public/cpp/bindings/lib/string_traits_wtf.cc',
- 'public/cpp/bindings/lib/wtf_serialization.h',
- 'public/cpp/bindings/string_traits_wtf.h',
- 'public/cpp/bindings/wtf_array.h',
- ],
- 'dependencies': [
- 'mojo_cpp_bindings',
- '../third_party/WebKit/Source/config.gyp:config',
Nico 2016/06/06 14:06:27 btw, do you know who added these? things outside o
sdefresne 2016/06/06 14:14:58 It was added by https://codereview.chromium.org/17
- '../third_party/WebKit/Source/wtf/wtf.gyp:wtf',
- ],
- 'export_dependent_settings': [
- 'mojo_cpp_bindings',
- '../third_party/WebKit/Source/config.gyp:config',
- ],
- 'direct_dependent_settings': {
- 'variables': {
- 'clang_warning_flags_unset': [ '-Wglobal-constructors' ],
Nico 2016/06/06 14:06:27 and this looks definitely very incorrect too :-/
sdefresne 2016/06/06 14:14:58 Same CL.
- },
- },
- },
- {
# GN version: //mojo/message_pump
'target_name': 'mojo_message_pump_lib',
'type': '<(component)',
@@ -411,19 +381,6 @@
'includes': [ 'mojom_bindings_generator.gypi' ],
},
{
- 'target_name': 'mojo_public_test_interfaces_mojom_blink',
- 'type': 'none',
- 'variables': {
- 'for_blink': 'true',
- 'mojom_typemaps': [
- 'public/cpp/bindings/tests/rect_blink.typemap',
- 'public/cpp/bindings/tests/test_native_types_blink.typemap',
- ],
- 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
- },
- 'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
- },
- {
# GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
'target_name': 'mojo_public_test_interfaces',
'type': 'static_library',
@@ -439,22 +396,6 @@
],
},
{
- # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_blink
- 'target_name': 'mojo_public_test_interfaces_blink',
- 'type': 'static_library',
- 'export_dependent_settings': [
- 'mojo_public_test_interfaces_mojom_blink',
- 'mojo_cpp_bindings',
- ],
- 'sources': [
- 'public/cpp/bindings/tests/pickled_struct_blink.cc',
- ],
- 'dependencies': [
- 'mojo_public_test_interfaces_mojom_blink',
- 'mojo_cpp_bindings',
- ],
- },
- {
'target_name': 'mojo_public_test_associated_interfaces_mojom',
'type': 'none',
'variables': {
@@ -488,17 +429,6 @@
],
'includes': [ 'mojom_bindings_generator.gypi' ],
},
- {
- 'target_name': 'mojo_public_test_wtf_types_blink',
- 'type': 'static_library',
- 'variables': {
- 'for_blink': 'true',
- },
- 'sources': [
- 'public/interfaces/bindings/tests/test_wtf_types.mojom',
- ],
- 'includes': [ 'mojom_bindings_generator.gypi' ],
- },
],
'conditions': [
['OS == "android"', {
@@ -537,5 +467,79 @@
},
],
}],
+ ['OS != "ios"', {
+ 'targets': [
+ {
+ # GN version: //mojo/public/cpp/bindings:wtf_support
+ 'target_name': 'mojo_cpp_bindings_wtf_support',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..'
+ ],
+ 'sources': [
+ 'public/cpp/bindings/array_traits_wtf.h',
+ 'public/cpp/bindings/array_traits_wtf_vector.h',
+ 'public/cpp/bindings/lib/string_traits_wtf.cc',
+ 'public/cpp/bindings/lib/wtf_serialization.h',
+ 'public/cpp/bindings/string_traits_wtf.h',
+ 'public/cpp/bindings/wtf_array.h',
+ ],
+ 'dependencies': [
+ 'mojo_cpp_bindings',
+ '../third_party/WebKit/Source/config.gyp:config',
+ '../third_party/WebKit/Source/wtf/wtf.gyp:wtf',
+ ],
+ 'export_dependent_settings': [
+ 'mojo_cpp_bindings',
+ '../third_party/WebKit/Source/config.gyp:config',
+ ],
+ 'direct_dependent_settings': {
+ 'variables': {
+ 'clang_warning_flags_unset': [ '-Wglobal-constructors' ],
+ },
+ },
+ },
+ {
+ 'target_name': 'mojo_public_test_interfaces_mojom_blink',
+ 'type': 'none',
+ 'variables': {
+ 'for_blink': 'true',
+ 'mojom_typemaps': [
+ 'public/cpp/bindings/tests/rect_blink.typemap',
+ 'public/cpp/bindings/tests/test_native_types_blink.typemap',
+ ],
+ 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
+ },
+ 'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+ },
+ {
+ # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_blink
+ 'target_name': 'mojo_public_test_interfaces_blink',
+ 'type': 'static_library',
+ 'export_dependent_settings': [
+ 'mojo_public_test_interfaces_mojom_blink',
+ 'mojo_cpp_bindings',
+ ],
+ 'sources': [
+ 'public/cpp/bindings/tests/pickled_struct_blink.cc',
+ ],
+ 'dependencies': [
+ 'mojo_public_test_interfaces_mojom_blink',
+ 'mojo_cpp_bindings',
+ ],
+ },
+ {
+ 'target_name': 'mojo_public_test_wtf_types_blink',
+ 'type': 'static_library',
+ 'variables': {
+ 'for_blink': 'true',
+ },
+ 'sources': [
+ 'public/interfaces/bindings/tests/test_wtf_types.mojom',
+ ],
+ 'includes': [ 'mojom_bindings_generator.gypi' ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/config.gyp » ('j') | third_party/WebKit/Source/config.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698