Index: mojo/android/BUILD.gn |
diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn |
index a816a04d063f4bb15bbeff945ba43b2c4706fe22..8e23c824c0448699a6a6e2f647ef1a1d02b53191 100644 |
--- a/mojo/android/BUILD.gn |
+++ b/mojo/android/BUILD.gn |
@@ -28,23 +28,27 @@ generate_jni("jni_headers") { |
generate_jni("system_java_jni_headers") { |
sources = [ |
"system/src/org/chromium/mojo/system/impl/CoreImpl.java", |
+ "system/src/org/chromium/mojo/system/impl/BaseRunLoop.java", |
] |
jni_package = "mojo" |
} |
-source_set("libsystem_java") { |
+source_set("libsystem_java_src") { |
qsr
2015/02/05 16:50:07
You can let this with its previous name.
etiennej
2015/02/06 16:22:29
Done.
|
sources = [ |
"system/core_impl.cc", |
"system/core_impl.h", |
+ "system/base_run_loop.cc", |
+ "system/base_run_loop.h", |
] |
deps = [ |
":system_java_jni_headers", |
"//base", |
- "//mojo/edk/system", |
- "//mojo/environment:chromium", |
"//mojo/public/cpp/environment", |
+ "//mojo/common:common", |
+ "//mojo/public/c/system:system", |
+ "//mojo/public/cpp/bindings:callback", |
] |
} |
@@ -57,6 +61,7 @@ android_library("system_java") { |
"system/src/org/chromium/mojo/system/impl/MessagePipeHandleImpl.java", |
"system/src/org/chromium/mojo/system/impl/SharedBufferHandleImpl.java", |
"system/src/org/chromium/mojo/system/impl/UntypedHandleImpl.java", |
+ "system/src/org/chromium/mojo/system/impl/BaseRunLoop.java", |
] |
deps = [ |
@@ -112,7 +117,7 @@ shared_library("mojo_java_unittests") { |
deps = [ |
":jni_headers", |
- ":libsystem_java", |
+ ":libsystem_java_src", |
":system_java_jni_headers", |
"//base", |
"//base/test/:test_support", |
@@ -121,6 +126,8 @@ shared_library("mojo_java_unittests") { |
"//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils", |
"//mojo/public/cpp/test_support:test_utils", |
"//mojo/public/cpp/environment", |
+ "//mojo/edk/system", |
+ "//mojo/environment:chromium", |
] |
defines = [ "UNIT_TEST" ] |
} |