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

Commit 77fff26a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Deprecate legacy_android10_support" am: 24507dc4 

Change-Id: I4ecf6974646bb5ae3735f9dada752d73b4db998a
parents 1e93c514 24507dc4

apex/Android.bp

+16 −2
Original line number Diff line number Diff line
@@ -41,8 +41,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 {
@@ -78,8 +85,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 {