summaryrefslogtreecommitdiffstats
path: root/mojo/android
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2016-02-10 01:57:08 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-10 09:58:42 +0000
commitc637caf9bac4b86535f19765ae91be2bc8467925 (patch)
tree550308031b8ecc3ce3cafb00e4f5d82b34b3c3f9 /mojo/android
parent4104d6998090894fca07949ef4d5d001c19ba051 (diff)
downloadchromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.zip
chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.tar.gz
chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.tar.bz2
[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}
Diffstat (limited to 'mojo/android')
-rw-r--r--mojo/android/BUILD.gn4
-rw-r--r--mojo/android/javatests/init_library.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn
index c1a78b2..368c716 100644
--- a/mojo/android/BUILD.gn
+++ b/mojo/android/BUILD.gn
@@ -45,10 +45,10 @@ source_set("libsystem_java") {
deps = [
":system_java_jni_headers",
"//base",
+ "//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/message_pump",
"//mojo/public/cpp/environment",
- "//third_party/mojo/src/mojo/edk/system",
]
}
@@ -123,11 +123,11 @@ shared_library("mojo_java_unittests") {
"//base",
"//base/test/:test_support",
"//build/config/sanitizers:deps",
+ "//mojo/edk/system",
"//mojo/message_pump",
"//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/test_support:test_utils",
- "//third_party/mojo/src/mojo/edk/system",
]
defines = [ "UNIT_TEST" ]
}
diff --git a/mojo/android/javatests/init_library.cc b/mojo/android/javatests/init_library.cc
index 8615897..d2d9423 100644
--- a/mojo/android/javatests/init_library.cc
+++ b/mojo/android/javatests/init_library.cc
@@ -10,7 +10,7 @@
#include "mojo/android/javatests/mojo_test_case.h"
#include "mojo/android/javatests/validation_test_util.h"
#include "mojo/android/system/core_impl.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/embedder.h"
namespace {
@@ -27,7 +27,7 @@ bool RegisterJNI(JNIEnv* env) {
}
bool Init() {
- mojo::embedder::Init();
+ mojo::edk::Init();
return true;
}