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

Commit 3625d8bb authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Add a sharded version of "framework-minus-apex"..." into main am: 43bea43b am: c94cc9fa 

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



Change-Id: Ia0815f7b9a3aaf11d71dc3f5d9d5538a8fd5e9df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3605a29 c94cc9fa

Android.bp

+44 −0
Original line number Diff line number Diff line
@@ -530,6 +530,50 @@ java_library { 
        ],

    },

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",



    jarjar_shards: select(release_flag("RELEASE_USE_SHARDED_JARJAR_ON_FRAMEWORK_MINUS_APEX"), {

        true: "10",

        default: "1",

    }),

}



// This is identical to "framework-minus-apex" but with "jarjar_shards" hardcodd.

// (also "stem" is commented out to avoid a conflict with the "framework-minus-apex")

// TODO(b/383559945) This module is just for local testing / verification. It's not used

// by anything. Remove it once we roll out RELEASE_USE_SHARDED_JARJAR_ON_FRAMEWORK_MINUS_APEX.

java_library {

    name: "framework-minus-apex_jarjar-sharded",

    defaults: [

        "framework-minus-apex-with-libs-defaults",

        "framework-non-updatable-lint-defaults",

    ],

    installable: true,

    // For backwards compatibility.

    // stem: "framework",

    apex_available: ["//apex_available:platform"],

    visibility: [

        "//frameworks/base",

        "//frameworks/base/location",

        // TODO(b/147128803) remove the below lines

        "//frameworks/base/apex/blobstore/framework",

        "//frameworks/base/apex/jobscheduler/framework",

        "//frameworks/base/packages/Tethering/tests/unit",

        "//packages/modules/Connectivity/Tethering/tests/unit",

    ],

    errorprone: {

        javacflags: [

            "-Xep:AndroidFrameworkCompatChange:ERROR",

            "-Xep:AndroidFrameworkUid:ERROR",

        ],

    },

    lint: {

        baseline_filename: "lint-baseline.xml",

        warning_checks: [

            "FlaggedApi",

        ],

    },

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

    jarjar_shards: "10",

}



java_library {