| Index: mojo/mojo_base.gyp
|
| diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
|
| index cd800cdbf2644ae1dfa49635e5f147058763208d..f7e1572151721227a5f9ad45228f806793aff253 100644
|
| --- a/mojo/mojo_base.gyp
|
| +++ b/mojo/mojo_base.gyp
|
| @@ -44,12 +44,8 @@
|
| ],
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| '../mojo/mojo_public.gyp:mojo_public_system',
|
| ],
|
| - 'export_dependent_settings': [
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - ],
|
| 'sources': [
|
| 'common/common_type_converters.cc',
|
| 'common/common_type_converters.h',
|
| @@ -81,13 +77,9 @@
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| '../url/url.gyp:url_lib',
|
| '../mojo/mojo_public.gyp:mojo_public_system',
|
| ],
|
| - 'export_dependent_settings': [
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - ],
|
| 'sources': [
|
| 'common/url_type_converters.cc',
|
| 'common/url_type_converters.h',
|
| @@ -160,7 +152,6 @@
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| 'mojo_common_lib',
|
| 'mojo_edk.gyp:mojo_system_impl',
|
| 'mojo_jni_headers',
|
|
|