Build speech recognizer library. Before only the mojo application was built for the speech recognizer. We now build both the android library and .mojo file. R=ppi@chromium.org, qsr@chromium.org Review URL: https://codereview.chromium.org/1990833002 .
diff --git a/services/speech_recognizer/BUILD.gn b/services/speech_recognizer/BUILD.gn index a9e1c75..c5cd06d 100644 --- a/services/speech_recognizer/BUILD.gn +++ b/services/speech_recognizer/BUILD.gn
@@ -6,17 +6,28 @@ mojo_android_java_application("speech_recognizer") { sources = [ + "src/org/chromium/mojo/speech_recognizer/SpeechRecognizer.java", + ] + + mojo_main = "org.chromium.mojo.speech_recognizer.SpeechRecognizer" + + deps = [ + ":speech_recognizer_lib", + "//mojo/public/java:application", + ] +} + +android_library("speech_recognizer_lib") { + java_files = [ "src/org/chromium/mojo/speech_recognizer/SpeechRecognizerApplicationDelegate.java", "src/org/chromium/mojo/speech_recognizer/SpeechRecognizerServiceImpl.java", ] - mojo_main = - "org.chromium.mojo.speech_recognizer.SpeechRecognizerApplicationDelegate" - deps = [ - "//base:base_java", "//mojo/public/interfaces/application:application_java", "//mojo/public/java:application", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//mojo/services/speech_recognizer/interfaces:interfaces_java", ] }
diff --git a/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizer.java b/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizer.java new file mode 100644 index 0000000..7914f8a --- /dev/null +++ b/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizer.java
@@ -0,0 +1,19 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.mojo.speech_recognizer; + +import android.content.Context; + +import org.chromium.mojo.application.ApplicationRunner; +import org.chromium.mojo.system.Core; +import org.chromium.mojo.system.MessagePipeHandle; + +final class SpeechRecognizer { + public static void mojoMain( + Context context, Core core, MessagePipeHandle applicationRequestHandle) { + ApplicationRunner.run( + new SpeechRecognizerApplicationDelegate(context), core, applicationRequestHandle); + } +}
diff --git a/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizerApplicationDelegate.java b/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizerApplicationDelegate.java index aba5b65..f0adff3 100644 --- a/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizerApplicationDelegate.java +++ b/services/speech_recognizer/src/org/chromium/mojo/speech_recognizer/SpeechRecognizerApplicationDelegate.java
@@ -8,11 +8,8 @@ import org.chromium.mojo.application.ApplicationConnection; import org.chromium.mojo.application.ApplicationDelegate; -import org.chromium.mojo.application.ApplicationRunner; import org.chromium.mojo.application.ServiceFactoryBinder; import org.chromium.mojo.bindings.InterfaceRequest; -import org.chromium.mojo.system.Core; -import org.chromium.mojo.system.MessagePipeHandle; import org.chromium.mojom.mojo.Shell; /** @@ -56,10 +53,4 @@ */ @Override public void quit() {} - - public static void mojoMain( - Context context, Core core, MessagePipeHandle applicationRequestHandle) { - ApplicationRunner.run( - new SpeechRecognizerApplicationDelegate(context), core, applicationRequestHandle); - } -} \ No newline at end of file +}