From 7600714a6f98f3f60c4e6473e70dac681ce7b2c1 Mon Sep 17 00:00:00 2001 From: Benjamin Lerman Date: Mon, 6 Jul 2015 14:56:14 +0200 Subject: [PATCH] Do not use android specific API in mojo/java. R=abarth@chromium.org, eseidel@chromium.org Review URL: https://codereview.chromium.org/1217573005. --- services/media/src/org/domokit/media/MediaServiceImpl.java | 1 - shell/android/library_loader.cc | 2 ++ shell/android/org/domokit/sky/shell/SkyMain.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/services/media/src/org/domokit/media/MediaServiceImpl.java b/services/media/src/org/domokit/media/MediaServiceImpl.java index 0bee6df57d1..f7ba50c1283 100644 --- a/services/media/src/org/domokit/media/MediaServiceImpl.java +++ b/services/media/src/org/domokit/media/MediaServiceImpl.java @@ -20,7 +20,6 @@ import java.util.concurrent.Executors; * Android implementation of MediaService. */ public class MediaServiceImpl implements MediaService { - private static final String TAG = "MediaServiceImpl"; private final Core mCore; private final Context mContext; private static ExecutorService sThreadPool; diff --git a/shell/android/library_loader.cc b/shell/android/library_loader.cc index f076c2d7975..5cb62e3e9b7 100644 --- a/shell/android/library_loader.cc +++ b/shell/android/library_loader.cc @@ -9,6 +9,7 @@ #include "base/android/library_loader/library_loader_hooks.h" #include "base/bind.h" #include "base/logging.h" +#include "mojo/android/system/base_run_loop.h" #include "mojo/android/system/core_impl.h" #include "sky/shell/android/platform_service_provider_android.h" #include "sky/shell/android/platform_view_android.h" @@ -19,6 +20,7 @@ namespace { base::android::RegistrationMethod kSkyRegisteredMethods[] = { {"CoreImpl", mojo::android::RegisterCoreImpl}, + {"BaseRunLoop", mojo::android::RegisterBaseRunLoop}, {"PlatformServiceProvider", sky::shell::RegisterPlatformServiceProvider}, {"PlatformViewAndroid", sky::shell::PlatformViewAndroid::Register}, {"SkyMain", sky::shell::RegisterSkyMain}, diff --git a/shell/android/org/domokit/sky/shell/SkyMain.java b/shell/android/org/domokit/sky/shell/SkyMain.java index 3150f4c6ee5..98a12751337 100644 --- a/shell/android/org/domokit/sky/shell/SkyMain.java +++ b/shell/android/org/domokit/sky/shell/SkyMain.java @@ -8,6 +8,7 @@ import android.content.Context; import android.util.Log; import org.chromium.base.JNINamespace; +import org.chromium.mojo.system.impl.CoreImpl; /** * A class to intialize the native code. @@ -32,6 +33,8 @@ public class SkyMain { SkyApplication app = (SkyApplication) applicationContext; app.getResourceExtractor().waitForCompletion(); nativeInit(applicationContext); + // Create the mojo run loop. + CoreImpl.getInstance().createDefaultRunLoop(); sInitialized = true; } catch (Exception e) { Log.e(TAG, "SkyMain initialization failed.", e);