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

Commit 0d0cd679 authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Automerger Merge Worker
Browse files

Merge "Set the container field of aconfig flags" into main am: 2a4da891 

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



Change-Id: Ifd5ff527e06dfafb50fac44c153e7f530fde6653
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 556a24a8 2a4da891

media/aconfig/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
aconfig_declarations {

    name: "aconfig_mediacodec_flags",

    package: "com.android.media.codec.flags",

    container: "system",

    srcs: ["mediacodec_flags.aconfig"],

}
@@ -28,6 +29,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "aconfig_codec_fwk_flags",

    package: "android.media.codec",

    container: "system",

    srcs: ["codec_fwk.aconfig"],

}

media/aconfig/codec_fwk.aconfig

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



package: "android.media.codec"

container: "system"



flag {

  name: "aidl_hal_input_surface"

media/aconfig/mediacodec_flags.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.media.codec.flags"

container: "system"



# ******************************************************************

#            !!! DO NOT ADD FURTHER FLAGS TO THIS FILE !!!