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

Commit fbd668b7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7398294 from c719287e to sc-release 

Change-Id: I4b27defb09d8dac5f44f9134ea60597153c825ff
parents 0014f5fa c719287e

Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -273,6 +273,11 @@ java_library { 
    installable: false,

}



filegroup {

    name: "framework-jarjar-rules",

    srcs: ["framework-jarjar-rules.txt"],

}



java_defaults {

    name: "framework-minus-apex-defaults",

    defaults: ["framework-aidl-export-defaults"],
@@ -294,7 +299,7 @@ java_defaults { 
        "--core-library",

        "--multi-dex",

    ],

    jarjar_rules: "framework-jarjar-rules.txt",

    jarjar_rules: ":framework-jarjar-rules",

    javac_shard_size: 150,

    plugins: [

        "view-inspector-annotation-processor",

StubLibraries.bp

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ modules_public_stubs = [ 


modules_system_stubs = [

    "android.net.ipsec.ike.stubs.system",

    "art.module.public.api.stubs", // Only has public stubs

    "art.module.public.api.stubs.system",

    "conscrypt.module.public.api.stubs", // Only has public stubs

    "framework-appsearch.stubs.system",

    "framework-connectivity.stubs.system",

api/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-system-current.txt",

    srcs: [

        ":art.module.public.api{.system.api.txt}",

        ":android.net.ipsec.ike{.system.api.txt}",

        ":framework-appsearch{.system.api.txt}",

        ":framework-connectivity{.system.api.txt}",
@@ -215,6 +216,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-system-removed.txt",

    srcs: [

        ":art.module.public.api{.system.removed-api.txt}",

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":framework-appsearch{.system.removed-api.txt}",

        ":framework-connectivity{.system.removed-api.txt}",
@@ -251,6 +253,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-module-lib-current.txt",

    srcs: [

        ":art.module.public.api{.module-lib.api.txt}",

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":framework-appsearch{.module-lib.api.txt}",

        ":framework-connectivity{.module-lib.api.txt}",
@@ -307,6 +310,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-module-lib-removed.txt",

    srcs: [

        ":art.module.public.api{.module-lib.removed-api.txt}",

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":framework-appsearch{.module-lib.removed-api.txt}",

        ":framework-connectivity{.module-lib.removed-api.txt}",

boot/Android.bp

+0 −44
Original line number Diff line number Diff line
@@ -47,58 +47,14 @@ platform_bootclasspath { 
    // The bootclasspath_fragments that contribute to the platform

    // bootclasspath.

    fragments: [

        {

            apex: "com.android.appsearch",

            module: "com.android.appsearch-bootclasspath-fragment",

        },

        {

            apex: "com.android.art",

            module: "art-bootclasspath-fragment",

        },

        {

            apex: "com.android.conscrypt",

            module: "com.android.conscrypt-bootclasspath-fragment",

        },

        {

            apex: "com.android.i18n",

            module: "i18n-bootclasspath-fragment",

        },

        {

            apex: "com.android.ipsec",

            module: "com.android.ipsec-bootclasspath-fragment",

        },

        {

            apex: "com.android.media",

            module: "com.android.media-bootclasspath-fragment",

        },

        {

            apex: "com.android.mediaprovider",

            module: "com.android.mediaprovider-bootclasspath-fragment",

        },

        {

            apex: "com.android.os.statsd",

            module: "com.android.os.statsd-bootclasspath-fragment",

        },

        {

            apex: "com.android.permission",

            module: "com.android.permission-bootclasspath-fragment",

        },

        {

            apex: "com.android.scheduling",

            module: "com.android.scheduling-bootclasspath-fragment",

        },

        {

            apex: "com.android.sdkext",

            module: "com.android.sdkext-bootclasspath-fragment",

        },

        {

            apex: "com.android.tethering",

            module: "com.android.tethering-bootclasspath-fragment",

        },

        {

            apex: "com.android.wifi",

            module: "com.android.wifi-bootclasspath-fragment",

        },

    ],



    // Additional information needed by hidden api processing.

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5958,7 +5958,6 @@ package android.app { 
    method @NonNull public android.app.Notification.Builder setRemoteInputHistory(CharSequence[]);

    method @NonNull public android.app.Notification.Builder setSettingsText(CharSequence);

    method @NonNull public android.app.Notification.Builder setShortcutId(String);

    method @Deprecated @NonNull public android.app.Notification.Builder setShowForegroundImmediately(boolean);

    method @NonNull public android.app.Notification.Builder setShowWhen(boolean);

    method @NonNull public android.app.Notification.Builder setSmallIcon(@DrawableRes int);

    method @NonNull public android.app.Notification.Builder setSmallIcon(@DrawableRes int, int);