Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d4726f5 authored by Atneya Nair's avatar Atneya Nair
Browse files

Modularize VoiceInteraction/SoundTrigger 

Rather than building VoiceInteraction monolithically, split out
SoundTrigger.

This allows for better build performance, more localized testing,
specific build flags, etc.

Split out the middleware in a static lib for now, but don't expose it
as such, since it will be refactored into SoundTrigger soon.

Fixes: 277374624
Test: Compiles (build changes only)
Change-Id: I631d073d81e578c70b033d0a43543ef89dda9194
parent 2fad91a2

services/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ filegroup { 
        ":services.searchui-sources",

        ":services.selectiontoolbar-sources",

        ":services.smartspace-sources",

        ":services.soundtrigger-sources",

        ":services.systemcaptions-sources",

        ":services.translation-sources",

        ":services.texttospeech-sources",
@@ -169,6 +170,7 @@ java_library { 
        "services.searchui",

        "services.selectiontoolbar",

        "services.smartspace",

        "services.soundtrigger",

        "services.systemcaptions",

        "services.translation",

        "services.texttospeech",

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ java_library_static { 
        "android.hardware.configstore-V1.1-java",

        "android.hardware.ir-V1-java",

        "android.hardware.rebootescrow-V1-java",

        "android.hardware.soundtrigger-V2.3-java",

        "android.hardware.power.stats-V2-java",

        "android.hardware.power-V4-java",

        "android.hidl.manager-V1.2-java",

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerInternal.java→services/core/java/com/android/server/SoundTriggerInternal.java

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.soundtrigger;

package com.android.server;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -29,15 +29,13 @@ import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; 
import android.media.permission.Identity;

import android.os.IBinder;



import com.android.server.voiceinteraction.VoiceInteractionManagerService;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.List;



/**

 * Provides a local service for managing voice-related recoginition models. This is primarily used

 * by the {@link VoiceInteractionManagerService}.

 * by the {@code VoiceInteractionManagerService}.

 */

public interface SoundTriggerInternal {

    /**

services/tests/voiceinteractiontests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ android_test { 
        "platform-test-annotations",

        "services.core",

        "services.voiceinteraction",

        "services.soundtrigger",

        "servicestests-core-utils",

        "servicestests-utils-mockito-extended",

        "truth-prebuilt",

services/voiceinteraction/Android.bp

+50 −1
Original line number Diff line number Diff line
@@ -9,11 +9,60 @@ package { 


filegroup {

    name: "services.voiceinteraction-sources",

    srcs: ["java/**/*.java"],

    srcs: ["java/com/android/server/voiceinteraction/*.java"],

    path: "java",

    visibility: ["//frameworks/base/services"],

}



filegroup {

    name: "services.soundtrigger_middleware-sources",

    srcs: ["java/com/android/server/soundtrigger_middleware/*.java"],

    path: "java",

    visibility: ["//visibility:private"],

}



filegroup {

    name: "services.soundtrigger_service-sources",

    srcs: ["java/com/android/server/soundtrigger/*.java"],

    path: "java",

    visibility: ["//visibility:private"],

}



filegroup {

    name: "services.soundtrigger-sources",

    srcs: [

        ":services.soundtrigger_service-sources",

        ":services.soundtrigger_middleware-sources",

    ],

    path: "java",

    visibility: ["//frameworks/base/services"],

}



java_library_static {

    name: "services.soundtrigger_middleware",

    defaults: ["platform_service_defaults"],

    srcs: [":services.soundtrigger_middleware-sources"],

    libs: [

        "services.core",

    ],

    static_libs: [

        "android.hardware.soundtrigger-V2.3-java",

    ],

    visibility: ["//visibility/base/services/tests/voiceinteraction"],

}



java_library_static {

    name: "services.soundtrigger",

    defaults: ["platform_service_defaults"],

    srcs: [":services.soundtrigger_service-sources"],

    libs: [

        "services.core",

    ],

    static_libs: [

        "services.soundtrigger_middleware",

    ],

}



java_library_static {

    name: "services.voiceinteraction",

    defaults: ["platform_service_defaults"],