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

Commit 6c02fa5f authored by Xin Li's avatar Xin Li
Browse files

Merge tm-dev-plus-aosp-without-vendor@8763363 

Bug: 236760014
Merged-In: I0d776f3fbdbba925cf1ac272270fb36f286dff91
Change-Id: Ic2243bf19ccf61691528426e625138adbe93140a
parents db5a75b0 eff0b66a

apex/Android.bp

+21 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ apex_defaults { 
    prebuilts: [

        "code_coverage.policy",

        "com.android.media-mediatranscoding.rc",

        "com.android.media-mediatranscoding.32rc",

        "crash_dump.policy",

        "mediaextractor.policy",

        "media-linker-config",
@@ -177,6 +178,7 @@ apex_defaults { 
    ],

    prebuilts: [

        "com.android.media.swcodec-mediaswcodec.rc",

        "com.android.media.swcodec-mediaswcodec.32rc",

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

        "mediaswcodec.policy",

        "code_coverage.policy",
@@ -201,17 +203,34 @@ apex_defaults { 
    compressible: true,

}



// install as mediatranscoding.* and mediaswcodec.* instead of init.*

// so we are ready for day we have more than 1 *rc file within the apex.



prebuilt_etc {

    name: "com.android.media-mediatranscoding.rc",

    src: "mediatranscoding.rc",

    filename: "init.rc",

    filename: "mediatranscoding.rc",

    installable: false,

}



prebuilt_etc {

    name: "com.android.media-mediatranscoding.32rc",

    src: "mediatranscoding.32rc",

    filename: "mediatranscoding.32rc",

    installable: false,

}



prebuilt_etc {

    name: "com.android.media.swcodec-mediaswcodec.rc",

    src: "mediaswcodec.rc",

    filename: "init.rc",

    filename: "mediaswcodec.rc",

    installable: false,

}



prebuilt_etc {

    name: "com.android.media.swcodec-mediaswcodec.32rc",

    src: "mediaswcodec.32rc",

    filename: "mediaswcodec.32rc",

    installable: false,

}

apex/mediaswcodec.32rc

+2 −0
Original line number Diff line number Diff line 
##  for SDK releases >= 32

##

service media.swcodec /apex/com.android.media.swcodec/bin/mediaswcodec

    class main

    user mediacodec

apex/mediaswcodec.rc

+3 −0
Original line number Diff line number Diff line 
##  for SDK releases 29..31

##  where writepid has not yet been replaced by task_profiles

##

service media.swcodec /apex/com.android.media.swcodec/bin/mediaswcodec

    class main

    user mediacodec

apex/mediatranscoding.32rc

+3 −0
Original line number Diff line number Diff line 
##  for SDK releases >= 32

##

#

# media.transcoding service is defined on com.android.media apex which goes back

# to API29, but we only want it started on API31+ devices. So we declare it as

# "disabled" and start it explicitly on boot.

apex/mediatranscoding.rc

+4 −0
Original line number Diff line number Diff line 
##  for SDK releases 29..31

##  where writepid has not yet been replaced by task_profiles

##

#

# media.transcoding service is defined on com.android.media apex which goes back

# to API29, but we only want it started on API31+ devices. So we declare it as

# "disabled" and start it explicitly on boot.