[mojo] Delete third_party/mojo
All users are on the new EDK now. This wipes out third_party/mojo,
updates all dependencies, and removes the use-new-edk flag.
BUG=None
Review URL: https://codereview.chromium.org/1676913002
Cr-Commit-Position: refs/heads/master@{#374631}
diff --git a/device/BUILD.gn b/device/BUILD.gn
index c197c59..463e77f 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -57,12 +57,12 @@
"//device/bluetooth:mocks",
"//device/nfc",
"//mojo/common",
+ "//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//net",
"//testing/gmock",
"//testing/gtest",
- "//third_party/mojo/src/mojo/edk/system",
"//tools/usb_gadget",
"//url",
]
diff --git a/device/battery/BUILD.gn b/device/battery/BUILD.gn
index 17cd64d..158dce3 100644
--- a/device/battery/BUILD.gn
+++ b/device/battery/BUILD.gn
@@ -31,9 +31,9 @@
":mojo_bindings",
"//base",
"//base/third_party/dynamic_annotations",
+ "//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
- "//third_party/mojo/src/mojo/edk/system",
]
if (is_chromeos) {
diff --git a/device/battery/battery.gyp b/device/battery/battery.gyp
index 679630f..32f7adf6 100644
--- a/device/battery/battery.gyp
+++ b/device/battery/battery.gyp
@@ -12,7 +12,7 @@
'target_name': 'device_battery_mojo_bindings',
'type': 'static_library',
'includes': [
- '../../third_party/mojo/mojom_bindings_generator.gypi',
+ '../../mojo/mojom_bindings_generator.gypi',
],
'sources': [
'battery_monitor.mojom',
@@ -57,7 +57,7 @@
'type': 'none',
'dependencies': [
'../../base/base.gyp:base',
- '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
+ '../../mojo/mojo_public.gyp:mojo_bindings_java',
'device_battery_mojo_bindings',
],
'variables': {
@@ -90,8 +90,8 @@
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
- '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_edk.gyp:mojo_system_impl',
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
'device_battery_mojo_bindings',
],
'defines': [
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index e73991b7..4503e129 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -13,10 +13,10 @@
'dependencies': [
'../base/base.gyp:test_support_base',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_edk.gyp:mojo_system_impl',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
'battery/battery.gyp:device_battery',
'battery/battery.gyp:device_battery_mojo_bindings',
diff --git a/device/devices_app/devices_app.gyp b/device/devices_app/devices_app.gyp
index 7f8e21c..6027a851 100644
--- a/device/devices_app/devices_app.gyp
+++ b/device/devices_app/devices_app.gyp
@@ -30,12 +30,12 @@
'<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
'<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
'<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
- '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
],
'export_dependent_settings': [
'<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
'<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
- '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
],
},
{
@@ -49,7 +49,7 @@
],
},
'includes': [
- '../../third_party/mojo/mojom_bindings_generator_explicit.gypi',
+ '../../mojo/mojom_bindings_generator_explicit.gypi',
],
},
{
diff --git a/device/nfc/nfc.gyp b/device/nfc/nfc.gyp
index 710bd227..9f17565 100644
--- a/device/nfc/nfc.gyp
+++ b/device/nfc/nfc.gyp
@@ -54,7 +54,7 @@
'target_name': 'device_nfc_mojo_bindings',
'type': 'static_library',
'includes': [
- '../../third_party/mojo/mojom_bindings_generator.gypi',
+ '../../mojo/mojom_bindings_generator.gypi',
],
'sources': [
'nfc.mojom',
diff --git a/device/serial/serial.gyp b/device/serial/serial.gyp
index 62cfb698..519263b 100644
--- a/device/serial/serial.gyp
+++ b/device/serial/serial.gyp
@@ -15,7 +15,7 @@
# generated cpp files must be listed explicitly in device_serial
'type': 'none',
'includes': [
- '../../third_party/mojo/mojom_bindings_generator.gypi',
+ '../../mojo/mojom_bindings_generator.gypi',
],
'sources': [
'data_stream.mojom',
@@ -74,14 +74,14 @@
],
'dependencies': [
'device_serial_mojo',
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../../net/net.gyp:net',
- '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../../third_party/re2/re2.gyp:re2',
'../core/core.gyp:device_core',
],
'export_dependent_settings': [
'device_serial_mojo',
- '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/device/serial/data_stream.mojom.cc',
diff --git a/device/test/DEPS b/device/test/DEPS
index c144476..b4a8f734 100644
--- a/device/test/DEPS
+++ b/device/test/DEPS
@@ -1,6 +1,6 @@
include_rules = [
+ "+mojo/edk/embedder",
"+net/base",
"+net/proxy",
"+net/url_request",
- "+third_party/mojo/src/mojo/edk/embedder",
]
diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc
index 76a4996..06b32a8 100644
--- a/device/test/run_all_unittests.cc
+++ b/device/test/run_all_unittests.cc
@@ -6,7 +6,7 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/embedder.h"
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
@@ -22,7 +22,7 @@
base::TestSuite test_suite(argc, argv);
- mojo::embedder::Init();
+ mojo::edk::Init();
return base::LaunchUnitTests(
argc,
argv,
diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn
index 0f541234..d783940 100644
--- a/device/vibration/BUILD.gn
+++ b/device/vibration/BUILD.gn
@@ -20,9 +20,9 @@
":mojo_bindings",
"//base",
"//base/third_party/dynamic_annotations",
+ "//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
- "//third_party/mojo/src/mojo/edk/system",
]
if (is_android) {
diff --git a/device/vibration/vibration.gyp b/device/vibration/vibration.gyp
index 99d75ba9..acef5d5 100644
--- a/device/vibration/vibration.gyp
+++ b/device/vibration/vibration.gyp
@@ -12,7 +12,7 @@
'target_name': 'device_vibration_mojo_bindings',
'type': 'static_library',
'includes': [
- '../../third_party/mojo/mojom_bindings_generator.gypi',
+ '../../mojo/mojom_bindings_generator.gypi',
],
'sources': [
'vibration_manager.mojom',
@@ -26,8 +26,8 @@
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
- '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_edk.gyp:mojo_system_impl',
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
'device_vibration_mojo_bindings',
],
'defines': [
@@ -57,7 +57,7 @@
'type': 'none',
'dependencies': [
'../../base/base.gyp:base',
- '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
+ '../../mojo/mojo_public.gyp:mojo_bindings_java',
'device_vibration_mojo_bindings',
],
'variables': {
