Remove all mojo and IPC dependencies on dynamic annotations.

BUG=None TBR=jam@chromium.org for //ipc build files Review-Url: https://codereview.chromium.org/2084443002 Cr-Commit-Position: refs/heads/master@{#400625}
marcosholgado · Jun 20, 2016 · d12c4d7 · d12c4d7
1 parent 9f7c5f2
commit d12c4d7
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 41 deletions.
diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn
@@ -133,9 +133,6 @@ component("ipc") {
   ]
   deps = [
     "//base",
-
-    # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
-    "//base/third_party/dynamic_annotations",
     "//mojo/public/cpp/bindings",
   ]
 

diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
@@ -18,8 +18,6 @@
       },
       'dependencies': [
         '../base/base.gyp:base',
-        # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../mojo/mojo_public.gyp:mojo_cpp_system',
       ],
@@ -180,9 +178,6 @@
           },
           'dependencies': [
             '../base/base.gyp:base_win64',
-            # TODO(viettrungluu): Needed for base/lazy_instance.h, which is
-            # suspect.
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
             '../crypto/crypto.gyp:crypto_nacl_win64',
             '../mojo/mojo_public.gyp:mojo_cpp_bindings_win64',
             '../mojo/mojo_public.gyp:mojo_cpp_system_win64',

diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn
@@ -32,7 +32,6 @@ component("mojo") {
   deps = [
     ":mojom",
     "//base",
-    "//base/third_party/dynamic_annotations",
     "//ipc",
     "//mojo/public/c/system",
     "//mojo/public/cpp/bindings",
@@ -51,7 +50,6 @@ test("ipc_mojo_unittests") {
     ":mojom",
     "//base",
     "//base/test:test_support",
-    "//base/third_party/dynamic_annotations",
     "//ipc",
     "//ipc:test_support",
     "//mojo/edk/system",
@@ -72,7 +70,6 @@ test("ipc_mojo_perftests") {
     ":mojom",
     "//base",
     "//base/test:test_support",
-    "//base/third_party/dynamic_annotations",
     "//ipc",
     "//ipc:test_support",
     "//mojo/edk/system",

diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp
@@ -21,7 +21,6 @@
       'dependencies': [
         '../ipc.gyp:ipc',
         '../../base/base.gyp:base',
-        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],

diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
@@ -43,10 +43,6 @@ component("common_base") {
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
   ]
-
-  deps = [
-    "//base/third_party/dynamic_annotations",
-  ]
 }
 
 # GYP version: mojo/mojo_base.gyp:mojo_url_type_converters
@@ -62,7 +58,6 @@ source_set("url_type_converters") {
 
   deps = [
     "//base",
-    "//base/third_party/dynamic_annotations",
     "//url",
   ]
 }

diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
@@ -88,7 +88,6 @@ component("system") {
 
   deps = [
     "//base",
-    "//base/third_party/dynamic_annotations",
   ]
 
   if (!is_nacl) {

diff --git a/mojo/message_pump/BUILD.gn b/mojo/message_pump/BUILD.gn
@@ -21,8 +21,4 @@ component("message_pump") {
     "//base",
     "//mojo/public/cpp/system",
   ]
-
-  deps = [
-    "//base/third_party/dynamic_annotations",
-  ]
 }
diff --git 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',

diff --git a/mojo/mojo_edk.gyp b/mojo/mojo_edk.gyp
@@ -26,7 +26,6 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
       ],
       'sources': [
@@ -39,7 +38,6 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
         'mojo_public.gyp:mojo_public_system',
         'mojo_system_ports',
@@ -187,7 +185,6 @@
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base_win64',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
             '../crypto/crypto.gyp:crypto_nacl_win64',
           ],
           'sources': [
@@ -205,7 +202,6 @@
           'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base_win64',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
             '../crypto/crypto.gyp:crypto_nacl_win64',
             'mojo_public.gyp:mojo_public_system_win64',
             'mojo_system_ports_win64',

diff --git a/mojo/mojo_edk_nacl.gyp b/mojo/mojo_edk_nacl.gyp
@@ -31,7 +31,6 @@
       'dependencies': [
         '../base/base_nacl.gyp:base_nacl',
         '../base/base_nacl.gyp:base_nacl_nonsfi',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         'mojo_public.gyp:mojo_public_system',
       ],
       'defines': [

diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
@@ -74,12 +74,8 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         'mojo_cpp_system',
       ],
-      'export_dependent_settings': [
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-      ],
       'sources': [
         'message_pump/handle_watcher.cc',
         'message_pump/handle_watcher.h',

diff --git a/mojo/mojo_public_nacl.gyp b/mojo/mojo_public_nacl.gyp
@@ -52,7 +52,6 @@
       'dependencies': [
         '../base/base_nacl.gyp:base_nacl',
         '../base/base_nacl.gyp:base_nacl_nonsfi',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../mojo/mojo_public.gyp:mojo_interface_bindings_cpp_sources',
         'mojo_cpp_system_nacl',
       ],