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

Commit ceec2bcb authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-e37767a8acfc463f909997fa16058fda" 

* changes:
  [automerge] media modules get more descriptive *.rc filenames 2p: 8cd6d143 2p: 48c82536
  [automerge] media modules get more descriptive *.rc filenames 2p: 8cd6d143
  media modules get more descriptive *.rc filenames
parents 51d0b4be ade600f6

apex/Android.bp

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

    prebuilts: [

        "code_coverage.policy",

        "code_coverage.policy",

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

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

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

        "crash_dump.policy",

        "crash_dump.policy",

        "mediaextractor.policy",

        "mediaextractor.policy",

        "media-linker-config",

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

    ],

    prebuilts: [

    prebuilts: [

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

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

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

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

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

        "mediaswcodec.policy",

        "mediaswcodec.policy",

        "code_coverage.policy",

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

    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 {

prebuilt_etc {

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

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

    src: "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,

    installable: false,

}

}





prebuilt_etc {

prebuilt_etc {

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

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

    src: "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,

    installable: false,

}

}

apex/mediaswcodec.32rc

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

##

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

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

    class main

    class main

    user mediacodec

    user mediacodec

apex/mediaswcodec.rc

+3 −0
Original line number Original line 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

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

    class main

    class main

    user mediacodec

    user mediacodec

apex/mediatranscoding.32rc

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

##

#

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

# 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

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

# "disabled" and start it explicitly on boot.

# "disabled" and start it explicitly on boot.

apex/mediatranscoding.rc

+4 −0
Original line number Original line 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

# 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

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

# "disabled" and start it explicitly on boot.

# "disabled" and start it explicitly on boot.