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

Commit 57c38f29 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

Merge "Allow bt import of android.media.audio-aconfig" into main am: 5a3b2f74 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3341680



Change-Id: Ibf18b937548712727ba739f925aa12fa89c7e723
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 538b7eb6 5a3b2f74

media/audio/aconfig/Android.bp

+19 −1
Original line number Diff line number Diff line
@@ -116,7 +116,11 @@ aconfig_declarations { 
    package: "android.media.audio",

    container: "system",

    srcs: ["audio_framework.aconfig"],

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

    visibility: [

        "//frameworks/base/api",

        "//frameworks/base/core/res",

    ],

    exportable: true,

}



aconfig_declarations {
@@ -148,6 +152,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.media.audio-aconfig-exported-java",

    aconfig_declarations: "android.media.audio-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    min_sdk_version: "Tiramisu",

    mode: "exported",

    apex_available: [

        "com.android.btservices",

    ],

    visibility: [

        "//packages/modules/Bluetooth:__subpackages__",

    ],

}



java_aconfig_library {

    name: "android.media.audiopolicy-aconfig-java",

    aconfig_declarations: "android.media.audiopolicy-aconfig",