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

Commit 4ffca876 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master

parents 0e30ca64 2e40c302

MainlineFiles.cfg

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# 

# mainline files for frameworks/av

#

# ignore comment (#) lines and blank lines

# rest are path prefixes starting at root of the project

# (so OWNERS, not frameworks/av/OWNERS)

# 

# path

# INCLUDE path

# EXCLUDE path

#

# 'path' and 'INCLUDE path' are identical -- they both indicate that this path

# is part of mainline

# EXCLUDE indicates that this is not part of mainline,

# so 'foo/' and 'EXCLUDE foo/nope'

# means everything under foo/ is part of mainline EXCEPT foo/nope.

# INCLUDE/EXCLUDE/INCLUDE nested structuring is not supported

#

# 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/"

#



media/codec2/components/

media/codecs/

media/extractors/

media/libstagefright/codecs/amrnb/

media/libstagefright/codecs/amrwb/

media/libstagefright/codecs/amrwbenc/

media/libstagefright/codecs/common/

media/libstagefright/codecs/flac/

media/libstagefright/codecs/m4v_h263/

media/libstagefright/codecs/mp3dec/

media/libstagefright/mpeg2ts

PREUPLOAD.cfg

0 → 100644
+2 −0
Original line number Diff line number Diff line 
[Hook Scripts]

mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO_ROOT} ${PREUPLOAD_FILES}

apex/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


apex_defaults {

    name: "com.android.media-defaults",

    updatable: true,

    java_libs: ["updatable-media"],

    multilib: {

        first: {
@@ -35,6 +36,8 @@ apex_defaults { 
    },

    prebuilts: [

        "mediaextractor.policy",

        "code_coverage.policy",

        "crash_dump.policy",

    ],

    key: "com.android.media.key",

    certificate: ":com.android.media.certificate",
@@ -70,6 +73,7 @@ filegroup { 


apex_defaults {

    name: "com.android.media.swcodec-defaults",

    updatable: true,

    binaries: [

        "mediaswcodec",

    ],
@@ -77,6 +81,8 @@ apex_defaults { 
        "com.android.media.swcodec-mediaswcodec.rc",

        "com.android.media.swcodec-ld.config.txt",

        "mediaswcodec.policy",

        "code_coverage.policy",

        "crash_dump.policy",

        "mediaswcodec.xml",

    ],

    use_vendor: true,

apex/AndroidManifest-media.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ 
  <!-- APEX does not have classes.dex -->

  <application android:hasCode="false" />

  <!-- Setting maxSdk to lock the module to Q. minSdk is auto-set by build system -->

  <uses-sdk

  <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->

  <!--uses-sdk

      android:maxSdkVersion="29"

      android:targetSdkVersion="29"

  />

  -->

</manifest>

apex/AndroidManifest-swcodec.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ 
  <!-- APEX does not have classes.dex -->

  <application android:hasCode="false" />

  <!-- Setting maxSdk to lock the module to Q. minSdk is auto-set by build system -->

  <uses-sdk

  <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->

  <!--uses-sdk

      android:maxSdkVersion="29"

      android:targetSdkVersion="29"

  />

  -->

</manifest>