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

Commit 1f736177 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12630846 from 64fbf64c to 25Q1-release 

Change-Id: If19b1fd28a08b3495f0c5eb17e21bff860e55800
parents a4d438a1 64fbf64c

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ java_defaults { 
        "com.android.sysprop.foldlockbehavior",

        "com.android.sysprop.view",

        "framework-internal-utils",

        "dynamic_instrumentation_manager_aidl-java",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // in favor of an API stubs dependency in java_library "framework" below.

        "mimemap",

api/Android.bp

+49 −13
Original line number Diff line number Diff line
@@ -127,27 +127,54 @@ combined_apis { 
    }),

}



// Create a single file containing the latest released version of the whole

// Android public API.

java_genrule {

    name: "android.api.merged.public.latest",

    srcs: [

        ":android.api.combined.public.latest",

    ],

    out: ["public-latest.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + " merge-signatures --format=2.0 $(in) --out $(out)",

}



// Make sure that the Android public API is compatible with the

// previously released public API.

java_genrule {

    name: "frameworks-base-api-current-compat",

    srcs: [

        ":android.api.public.latest",

        ":android.api.merged.public.latest",

        ":android-incompatibilities.api.public.latest",

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

    ],

    out: ["updated-baseline.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd +

        "--check-compatibility:api:released $(location :android.api.public.latest) " +

        "--check-compatibility:api:released $(location :android.api.merged.public.latest) " +

        "--baseline:compatibility:released $(location :android-incompatibilities.api.public.latest) " +

        "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +

        "$(location :frameworks-base-api-current.txt)",

}



// Create a single file containing the latest released version of the whole

// Android system API.

java_genrule {

    name: "android.api.merged.system.latest",

    srcs: [

        ":android.api.combined.system.latest",

    ],

    out: ["system-latest.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + " merge-signatures --format=2.0 $(in) --out $(out)",

}



// Make sure that the Android system API is compatible with the

// previously released system API.

java_genrule {

    name: "frameworks-base-api-system-current-compat",

    srcs: [

        ":android.api.public.latest",

        ":android.api.system.latest",

        ":android.api.merged.system.latest",

        ":android-incompatibilities.api.system.latest",

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

        ":frameworks-base-api-system-current.txt",
@@ -155,20 +182,31 @@ java_genrule { 
    out: ["updated-baseline.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd +

        "--check-compatibility:api:released $(location :android.api.public.latest) " +

        "--check-compatibility:api:released $(location :android.api.system.latest) " +

        "--check-compatibility:api:released $(location :android.api.merged.system.latest) " +

        "--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " +

        "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +

        "$(location :frameworks-base-api-current.txt) " +

        "$(location :frameworks-base-api-system-current.txt)",

}



// Create a single file containing the latest released version of the whole

// Android module-lib API.

java_genrule {

    name: "android.api.merged.module-lib.latest",

    srcs: [

        ":android.api.combined.module-lib.latest",

    ],

    out: ["module-lib-latest.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + " merge-signatures --format=2.0 $(in) --out $(out)",

}



// Make sure that the Android module-lib API is compatible with the

// previously released module-lib API.

java_genrule {

    name: "frameworks-base-api-module-lib-current-compat",

    srcs: [

        ":android.api.public.latest",

        ":android.api.system.latest",

        ":android.api.module-lib.latest",

        ":android.api.merged.module-lib.latest",

        ":android-incompatibilities.api.module-lib.latest",

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

        ":frameworks-base-api-system-current.txt",
@@ -177,9 +215,7 @@ java_genrule { 
    out: ["updated-baseline.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd +

        "--check-compatibility:api:released $(location :android.api.public.latest) " +

        "--check-compatibility:api:released $(location :android.api.system.latest) " +

        "--check-compatibility:api:released $(location :android.api.module-lib.latest) " +

        "--check-compatibility:api:released $(location :android.api.merged.module-lib.latest) " +

        "--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " +

        "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +

        "$(location :frameworks-base-api-current.txt) " +
@@ -194,7 +230,7 @@ java_genrule { 
    cmd: "$(location merge_zips) $(out) $(in)",

    srcs: [

        ":api-stubs-docs-non-updatable{.exportable}",

        ":all-modules-public-stubs-source",

        ":all-modules-public-stubs-source-exportable",

    ],

    visibility: ["//visibility:private"], // Used by make module in //development, mind

}

api/ApiDocs.bp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ droidstubs { 
droidstubs {

    name: "framework-doc-stubs",

    defaults: ["android-non-updatable-doc-stubs-defaults"],

    srcs: [":all-modules-public-stubs-source"],

    srcs: [":all-modules-public-stubs-source-exportable"],

    api_levels_module: "api_versions_public",

    aidl: {

        include_dirs: [

api/api.go

+3 −2
Original line number Diff line number Diff line
@@ -429,8 +429,9 @@ func createMergedFrameworkSystemServerExportableStubs(ctx android.LoadHookContex 


func createPublicStubsSourceFilegroup(ctx android.LoadHookContext, modules proptools.Configurable[[]string]) {

	props := fgProps{}

	props.Name = proptools.StringPtr("all-modules-public-stubs-source")

	props.Device_common_srcs = createSrcs(modules, "{.public.stubs.source}")

	props.Name = proptools.StringPtr("all-modules-public-stubs-source-exportable")

	transformConfigurableArray(modules, "", ".stubs.source")

	props.Device_common_srcs = createSrcs(modules, "{.exportable}")

	props.Visibility = []string{"//frameworks/base"}

	ctx.CreateModule(android.FileGroupFactory, &props)

}

core/api/current.txt

+75 −26

File changed.

Preview size limit exceeded, changes collapsed.