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

Commit 10799682 authored by Nada Hussein's avatar Nada Hussein Committed by Automerger Merge Worker
Browse files

Merge "Use q launch defaults for dcla for com.android.media and... 

Merge "Use q launch defaults for dcla for com.android.media and com.android.media.swcodec." am: 61c04107 am: 9d58cd9a

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



Change-Id: Icba2fa6e6fdb9f58e259cb129facb301b01617f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d36583b 9d58cd9a

apex/Android.bp

+10 −6
Original line number Diff line number Diff line
@@ -67,13 +67,15 @@ apex_defaults { 
    // Use a custom AndroidManifest.xml used for API targeting.

    androidManifest: ":com.android.media-androidManifest",



    // IMPORTANT: q-launched-apex-module enables the build system to make

    // sure the package compatible to Android 10 in two ways:

    // IMPORTANT: q-launched-dcla-enabled-apex-module enables the build system to make

    // sure the package compatible to Android 10 in two ways(if flag APEX_BUILD_FOR_PRE_S_DEVICES=1

    // is set):

    // - build the APEX package compatible to Android 10

    //   so that the package can be installed.

    // - build artifacts (lib/javalib/bin) against Android 10 SDK

    //   so that the artifacts can run.

    defaults: ["q-launched-apex-module"],

    // If the flag is not set, the package is built to be compatible with Android 12.

    defaults: ["q-launched-dcla-enabled-apex-module"],

    // Indicates that pre-installed version of this apex can be compressed.

    // Whether it actually will be compressed is controlled on per-device basis.

    compressible: true,
@@ -191,13 +193,15 @@ apex_defaults { 
    // Use a custom AndroidManifest.xml used for API targeting.

    androidManifest: ":com.android.media.swcodec-androidManifest",



    // IMPORTANT: q-launched-apex-module enables the build system to make

    // sure the package compatible to Android 10 in two ways:

    // IMPORTANT: q-launched-dcla-enabled-apex-module enables the build system to make

    // sure the package compatible to Android 10 in two ways(if flag APEX_BUILD_FOR_PRE_S_DEVICES=1

    // is set):

    // - build the APEX package compatible to Android 10

    //   so that the package can be installed.

    // - build artifacts (lib/javalib/bin) against Android 10 SDK

    //   so that the artifacts can run.

    defaults: ["q-launched-apex-module"],

    // If the flag is not set, the package is built to be compatible with Android 12.

    defaults: ["q-launched-dcla-enabled-apex-module"],

    // Indicates that pre-installed version of this apex can be compressed.

    // Whether it actually will be compressed is controlled on per-device basis.

    compressible: true,