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

Commit 4339e6cc authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "m framework-minus-apex should not build services" into main am: 13c1831f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799993



Change-Id: I148814a39e3f5dd99339c72dbb5e479a18e36d52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb66a485 13c1831f

Android.bp

+16 −7
Original line number Diff line number Diff line
@@ -370,17 +370,12 @@ java_defaults { 
        // TODO(b/120066492): remove default_television.xml when the build system

        // propagates "required" properly.

        "default_television.xml",

        "framework-platform-compat-config",

        // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build

        // system propagates "required" properly.

        "gps_debug.conf",

        "icu4j-platform-compat-config",

        "protolog.conf.json.gz",

        "services-platform-compat-config",

        "TeleService-platform-compat-config",

        "documents-ui-compat-config",

        "calendar-provider-compat-config",

        "contacts-provider-platform-compat-config",

        // any install dependencies should go into framework-minus-apex-install-dependencies

        // rather than here to avoid bloating incremental build time

    ],

    libs: [

        "androidx.annotation_annotation",
@@ -523,6 +518,20 @@ java_library { 
    apex_available: ["//apex_available:platform"],

}



java_library {

    name: "framework-minus-apex-install-dependencies",

    required: [

        "framework-minus-apex",

        "framework-platform-compat-config",

        "services-platform-compat-config",

        "icu4j-platform-compat-config",

        "TeleService-platform-compat-config",

        "documents-ui-compat-config",

        "calendar-provider-compat-config",

        "contacts-provider-platform-compat-config",

    ],

}



platform_compat_config {

    name: "framework-platform-compat-config",

    src: ":framework-minus-apex",