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

Commit 39a1dbbf authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Deprecate legacy_android10_support" am: 24507dc4 am: 77fff26a am:...

Merge "Deprecate legacy_android10_support" am: 24507dc4 am: 77fff26a am: 09f2eebf am: 14ceb5e6 am: b8f318f0

Change-Id: I95fcf35da94d2d71e7c72cdefb485ba7a33c96bb
parents 60f21f00 b8f318f0
Loading
Loading
Loading
Loading
+16 −2
Original line number Diff line number Diff line
@@ -44,8 +44,15 @@ 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
    // 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",
    legacy_android10_support: true,
}

apex {
@@ -84,8 +91,15 @@ 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
    // 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",
    legacy_android10_support: true,
}

prebuilt_etc {