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

Commit d781f977 authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Android (Google) Code Review
Browse files

Merge "Set the container field of aconfig flags" into main

parents 16354ba5 e7006459

camera/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ license { 
aconfig_declarations {

    name: "camera_platform_flags",

    package: "com.android.internal.camera.flags",

    container: "system",

    srcs: ["camera_platform.aconfig"],

}

camera/camera_platform.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.internal.camera.flags"

container: "system"



flag {

     namespace: "camera_platform"

media/audio/aconfig/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -8,18 +8,21 @@ cc_defaults { 
aconfig_declarations {

    name: "com.android.media.audioserver-aconfig",

    package: "com.android.media.audioserver",

    container: "system",

    srcs: ["audioserver.aconfig"],

}



aconfig_declarations {

    name: "com.android.media.audio-aconfig",

    package: "com.android.media.audio",

    container: "system",

    srcs: ["audio.aconfig"],

}



aconfig_declarations {

    name: "com.android.media.aaudio-aconfig",

    package: "com.android.media.aaudio",

    container: "system",

    srcs: ["aaudio.aconfig"],

}
@@ -81,6 +84,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.media.audio",

    container: "system",

    srcs: ["audio_framework.aconfig"],

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

}
@@ -88,6 +92,7 @@ aconfig_declarations { 
aconfig_declarations {

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

    package: "android.media.audiopolicy",

    container: "system",

    srcs: ["audiopolicy_framework.aconfig"],

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

}
@@ -95,6 +100,7 @@ aconfig_declarations { 
aconfig_declarations {

    name: "android.media.midi-aconfig",

    package: "android.media.midi",

    container: "system",

    srcs: ["midi_flags.aconfig"],

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

}

media/audio/aconfig/aaudio.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# Please add flags in alphabetical order.



package: "com.android.media.aaudio"

container: "system"



flag {

    name: "sample_rate_conversion"

media/audio/aconfig/audio.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# Please add flags in alphabetical order.



package: "com.android.media.audio"

container: "system"



flag {

    name: "alarm_min_volume_zero"