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

Commit 8ae98f4c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update list of mainline-involved files" am: e9cad549 am: 98cea4c8 am: 4838bb50 

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



Change-Id: I3c92e9e2fa95db1f5c1845672e00908bf8e1c6db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75da8719 4838bb50

MainlineFiles.cfg

+13 −5
Original line number Diff line number Diff line
@@ -21,11 +21,19 @@ 
#

# matching is purely prefix

# so 'foo' will match 'foo', 'foo.c', 'foo/bar/baz'

# if you want to exclude a directory, best to use a pattern like "foo/"

# if you want to specify a directory, best to use a pattern like "foo/"

#



apex/

media/codec2/components/

media/codecs/

media/extractors/

media/libstagefright/mpeg2ts/

media/libstagefright/flac/
 
media/codec2/core/

media/codec2/hidl/

media/codec2/sfplugin/utils/

media/codec2/vndk/

media/module/

services/mediacodec/



# source code used in both framework and mainline libraries

media/libstagefright/HevcUtils.cpp

media/libstagefright/MediaSource.cpp

media/libstagefright/Utils.cpp

OWNERS

+4 −0
Original line number Diff line number Diff line
@@ -10,3 +10,7 @@ include platform/frameworks/av:/media/janitors/media_solutions_OWNERS 
## Only contact for media changes as a fallback

etalvala@google.com

shuzhenwang@google.com



# mainline related

per-file MainlineFiles.cfg=essick@google.com

per-file MainlineFiles.cfg=file:/media/janitors/reliability_mainline_OWNERS