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

Commit 45c5b1c7 authored by Ytai Ben-tsvi's avatar Ytai Ben-tsvi Committed by Android (Google) Code Review
Browse files

Merge "Separate AIDL packages"

parents fbffe3f1 da7c21ec

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ java_library { 
    exclude_srcs: ["core/java/android/content/pm/AndroidTestBaseUpdater.java"],

    aidl: {

        generate_get_transaction_name: true,

        local_include_dirs: ["media/aidl"],

    },

    dxflags: [

        "--core-library",
@@ -583,6 +584,7 @@ java_library { 
        // in favor of an API stubs dependency in java_library "framework" below.

        "mimemap",

        "mediatranscoding_aidl_interface-java",

        "soundtrigger_middleware-aidl-java",

    ],

    // For backwards compatibility.

    stem: "framework",

ApiDocs.bp

+8 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ stubs_defaults { 
    merge_annotations_dirs: [

        "metalava-manual",

    ],

    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

    },

}



droidstubs {
@@ -150,6 +154,10 @@ doc_defaults { 
        ":current-support-api",

        ":current-androidx-api",

    ],

    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

    },

}



doc_defaults {

StubLibraries.bp

+5 −2
Original line number Diff line number Diff line
@@ -51,9 +51,12 @@ stubs_defaults { 
        ":android_icu4j_public_api_files",

        "**/package.html",

    ],

    // TODO(b/147699819): remove below aidl includes.

    // TODO(b/147699819, b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["telephony/java"],

        local_include_dirs: [

            "telephony/java",

            "media/aidl",

        ],

    },

    libs: ["framework-internal-utils"],

    installable: false,

core/java/android/hardware/soundtrigger/ConversionUtil.java

+8 −1
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ import android.media.soundtrigger_middleware.RecognitionMode; 
import android.media.soundtrigger_middleware.SoundModel;

import android.media.soundtrigger_middleware.SoundTriggerModuleDescriptor;

import android.media.soundtrigger_middleware.SoundTriggerModuleProperties;

import android.os.ParcelFileDescriptor;

import android.os.SharedMemory;

import android.system.ErrnoException;



import java.io.FileDescriptor;

import java.io.IOException;

import java.nio.ByteBuffer;

import java.util.Arrays;

import java.util.UUID;
@@ -109,7 +111,12 @@ class ConversionUtil { 
        aidlModel.type = apiModel.getType();

        aidlModel.uuid = api2aidlUuid(apiModel.getUuid());

        aidlModel.vendorUuid = api2aidlUuid(apiModel.getVendorUuid());

        aidlModel.data = byteArrayToSharedMemory(apiModel.getData(), "SoundTrigger SoundModel");

        try {

            aidlModel.data = ParcelFileDescriptor.dup(

                    byteArrayToSharedMemory(apiModel.getData(), "SoundTrigger SoundModel"));

        } catch (IOException e) {

            throw new RuntimeException(e);

        }

        aidlModel.dataSize = apiModel.getData().length;

        return aidlModel;

    }

media/Android.bp

+30 −63
Original line number Diff line number Diff line 
aidl_interface {

    name: "audio_common-aidl",

    unstable: true,

    local_include_dir: "java",

    local_include_dir: "aidl",

    srcs: [

        "java/android/media/audio/common/AudioChannelMask.aidl",

        "java/android/media/audio/common/AudioConfig.aidl",

        "java/android/media/audio/common/AudioFormat.aidl",

        "java/android/media/audio/common/AudioOffloadInfo.aidl",

        "java/android/media/audio/common/AudioStreamType.aidl",

        "java/android/media/audio/common/AudioUsage.aidl",

        "aidl/android/media/audio/common/AudioChannelMask.aidl",

        "aidl/android/media/audio/common/AudioConfig.aidl",

        "aidl/android/media/audio/common/AudioFormat.aidl",

        "aidl/android/media/audio/common/AudioOffloadInfo.aidl",

        "aidl/android/media/audio/common/AudioStreamType.aidl",

        "aidl/android/media/audio/common/AudioUsage.aidl",

    ],

    backend:

    {

        cpp: {

            enabled: true,

        },

        java: {

            // Already generated as part of the entire media java library.

            enabled: false,

        },

    },

}



aidl_interface {

    name: "media_permission-aidl",

    unstable: true,

    local_include_dir: "java",

    local_include_dir: "aidl",

    srcs: [

        "java/android/media/permission/Identity.aidl",

        "aidl/android/media/permission/Identity.aidl",

    ],

    backend:

    {

        cpp: {

            enabled: true,

        },

        java: {

            // Already generated as part of the entire media java library.

            enabled: false,

        },

    },

}



aidl_interface {

    name: "soundtrigger_middleware-aidl",

    unstable: true,

    local_include_dir: "java",

    local_include_dir: "aidl",

    srcs: [

        "java/android/media/soundtrigger_middleware/ConfidenceLevel.aidl",

        "java/android/media/soundtrigger_middleware/ISoundTriggerCallback.aidl",

        "java/android/media/soundtrigger_middleware/ISoundTriggerMiddlewareService.aidl",

        "java/android/media/soundtrigger_middleware/ISoundTriggerModule.aidl",

        "java/android/media/soundtrigger_middleware/ModelParameter.aidl",

        "java/android/media/soundtrigger_middleware/ModelParameterRange.aidl",

        "java/android/media/soundtrigger_middleware/Phrase.aidl",

        "java/android/media/soundtrigger_middleware/PhraseRecognitionEvent.aidl",

        "java/android/media/soundtrigger_middleware/PhraseRecognitionExtra.aidl",

        "java/android/media/soundtrigger_middleware/PhraseSoundModel.aidl",

        "java/android/media/soundtrigger_middleware/RecognitionConfig.aidl",

        "java/android/media/soundtrigger_middleware/RecognitionEvent.aidl",

        "java/android/media/soundtrigger_middleware/RecognitionMode.aidl",

        "java/android/media/soundtrigger_middleware/RecognitionStatus.aidl",

        "java/android/media/soundtrigger_middleware/SoundModel.aidl",

        "java/android/media/soundtrigger_middleware/SoundModelType.aidl",

        "java/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl",

        "java/android/media/soundtrigger_middleware/SoundTriggerModuleProperties.aidl",

        "java/android/media/soundtrigger_middleware/Status.aidl",

        "aidl/android/media/soundtrigger_middleware/AudioCapabilities.aidl",

        "aidl/android/media/soundtrigger_middleware/ConfidenceLevel.aidl",

        "aidl/android/media/soundtrigger_middleware/ISoundTriggerCallback.aidl",

        "aidl/android/media/soundtrigger_middleware/ISoundTriggerMiddlewareService.aidl",

        "aidl/android/media/soundtrigger_middleware/ISoundTriggerModule.aidl",

        "aidl/android/media/soundtrigger_middleware/ModelParameter.aidl",

        "aidl/android/media/soundtrigger_middleware/ModelParameterRange.aidl",

        "aidl/android/media/soundtrigger_middleware/Phrase.aidl",

        "aidl/android/media/soundtrigger_middleware/PhraseRecognitionEvent.aidl",

        "aidl/android/media/soundtrigger_middleware/PhraseRecognitionExtra.aidl",

        "aidl/android/media/soundtrigger_middleware/PhraseSoundModel.aidl",

        "aidl/android/media/soundtrigger_middleware/RecognitionConfig.aidl",

        "aidl/android/media/soundtrigger_middleware/RecognitionEvent.aidl",

        "aidl/android/media/soundtrigger_middleware/RecognitionMode.aidl",

        "aidl/android/media/soundtrigger_middleware/RecognitionStatus.aidl",

        "aidl/android/media/soundtrigger_middleware/SoundModel.aidl",

        "aidl/android/media/soundtrigger_middleware/SoundModelType.aidl",

        "aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl",

        "aidl/android/media/soundtrigger_middleware/SoundTriggerModuleProperties.aidl",

        "aidl/android/media/soundtrigger_middleware/Status.aidl",

    ],

    backend:

    {

        cpp: {

            enabled: true,

        },

        java: {

            // Already generated as part of the entire media java library.

            enabled: false,

        },

        ndk: {

            // Not currently needed, and disabled because of b/146172425

            enabled: false,

        },

    },

    imports: [

        "audio_common-aidl",

        "media_permission-aidl",