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

Commit e34febe6 authored by Gurpreet Singh's avatar Gurpreet Singh Committed by Automerger Merge Worker
Browse files

Merge "Using common apex_defaults for listed modules." am: ffddb1da am:... 

Merge "Using common apex_defaults for listed modules." am: ffddb1da am: ccb3f81f am: 26968946 am: 6bbe3114

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

Change-Id: I0096c1ccbedba58fc312567d7433c673d49d3366
parents a9fc303e 6bbe3114

apex/Android.bp

+4 −8
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ package { 


apex_defaults {

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

    updatable: true,

    bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],

    systemserverclasspath_fragments: ["com.android.media-systemserverclasspath-fragment"],

    multilib: {
@@ -67,14 +66,13 @@ apex_defaults { 
    // Use a custom AndroidManifest.xml used for API targeting.

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



    // IMPORTANT: For the APEX to be installed on Android 10 (API 29),

    // min_sdk_version should be 29. This enables the build system to make

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

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

    // - 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.

    min_sdk_version: "29",

    defaults: ["q-launched-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,
@@ -148,7 +146,6 @@ filegroup { 


apex_defaults {

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

    updatable: true,

    binaries: [

        "mediaswcodec",

    ],
@@ -172,14 +169,13 @@ apex_defaults { 
    // Use a custom AndroidManifest.xml used for API targeting.

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



    // IMPORTANT: For the APEX to be installed on Android 10 (API 29),

    // min_sdk_version should be 29. This enables the build system to make

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

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

    // - 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.

    min_sdk_version: "29",

    defaults: ["q-launched-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,