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

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

Merge "Using common apex_defaults for com.android.resolv module." am:... 

Merge "Using common apex_defaults for com.android.resolv module." am: 6e346f3e am: a05e7328 am: 347a5498

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2007750

Change-Id: Iad24c73021013db09caa24b684ae0a3bc7ef7121
parents f921f1b9 347a5498

apex/Android.bp

+2 −4
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ package { 




apex {

apex {

    name: "com.android.resolv",

    name: "com.android.resolv",

    updatable: true,

    manifest: "manifest.json",

    manifest: "manifest.json",

    multilib: {

    multilib: {

        first: {

        first: {
@@ -41,14 +40,13 @@ apex { 
    // Whether it actually will be compressed is controlled on per-device basis.

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

    compressible: true,

    compressible: true,





    // IMPORTANT: For the APEX to be installed on Android 10,

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

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

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

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

    // - build the APEX package compatible to Android 10

    // - build the APEX package compatible to Android 10

    //   so that the package can be installed.

    //   so that the package can be installed.

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

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

    //   so that the artifacts can run.

    //   so that the artifacts can run.

    min_sdk_version: "29",

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

}

}





apex_key {

apex_key {