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

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

Snap for 12199973 from c2fc6685 to 24Q4-release 

Change-Id: I401bece8dfdac4512831a717e1fa686efe3fa949
parents c459f800 c2fc6685

AconfigFlags.bp

+1 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,7 @@ cc_aconfig_library { 
// Chooser / "Sharesheet"

aconfig_declarations {

    name: "android.service.chooser.flags-aconfig",

    exportable: true,

    package: "android.service.chooser",

    container: "system",

    srcs: ["core/java/android/service/chooser/flags.aconfig"],

Ravenwood.bp

+62 −160
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ java_library { 
    visibility: ["//visibility:private"],

}



// Generate the stub/impl from framework-all, with hidden APIs.

// Process framework-all with hoststubgen for Ravenwood.

// This step takes several tens of seconds, so we manually shard it to multiple modules.

// All the copies have to be kept in sync.

// TODO: Do the sharding better.

// TODO: Do the sharding better, either by making hostsubgen support sharding natively, or

// making a better build rule.



genrule_defaults {

    name: "framework-minus-apex.ravenwood-base_defaults",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    tools: ["hoststubgen"],

    srcs: [

        ":framework-minus-apex-for-hoststubgen",
@@ -50,15 +52,9 @@ genrule_defaults { 
        "hoststubgen_framework-minus-apex_stats.csv",

        "hoststubgen_framework-minus-apex_apis.csv",

    ],

    visibility: ["//visibility:private"],

}



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X0",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 0 " + // Only this line differs



framework_minus_apex_cmd = "$(location hoststubgen) " +

    "@$(location :ravenwood-standard-options) " +



    "--debug-log $(location hoststubgen_framework-minus-apex.log) " +
@@ -72,117 +68,78 @@ java_genrule { 


    "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

    "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) "



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X0",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 0",

}



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X1",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 1 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



        "--out-impl-jar $(location ravenwood.jar) " +



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 1",

}



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X2",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 2 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



        "--out-impl-jar $(location ravenwood.jar) " +



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 2",

}



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X3",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 3 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



        "--out-impl-jar $(location ravenwood.jar) " +



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 3",

}



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X4",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 4 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



        "--out-impl-jar $(location ravenwood.jar) " +



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 4",

}



java_genrule {

    name: "framework-minus-apex.ravenwood-base_X5",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 5 " + // Only this line differs

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 5",

}



        "@$(location :ravenwood-standard-options) " +

java_genrule {

    name: "framework-minus-apex.ravenwood-base_X6",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 6",

}



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +

java_genrule {

    name: "framework-minus-apex.ravenwood-base_X7",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 7",

}



        "--out-impl-jar $(location ravenwood.jar) " +

java_genrule {

    name: "framework-minus-apex.ravenwood-base_X8",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 8",

}



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +

java_genrule {

    name: "framework-minus-apex.ravenwood-base_X9",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 9",

}



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

// Build framework-minus-apex.ravenwood-base without sharding.

// We extract the various dump files from this one, rather than the sharded ones, because

// some dumps use the output from other classes (e.g. base classes) which may not be in the

// same shard.

// Not using sharding is fine for this module because it's only used for collecting the

// dump / stats files, which don't have to happen regularly.

java_genrule {

    name: "framework-minus-apex.ravenwood-base_all",

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd,

}



// Marge all the sharded jars
@@ -198,73 +155,16 @@ java_genrule { 
        ":framework-minus-apex.ravenwood-base_X3{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X4{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X5{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X6{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X7{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X8{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X9{ravenwood.jar}",

    ],

    out: [

        "framework-minus-apex.ravenwood.jar",

    ],

}



// Merge the sharded text files

genrule {

    name: "hoststubgen_framework-minus-apex_stats.csv",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_stats.csv}",

    ],

    out: ["hoststubgen_framework-minus-apex_stats.csv"],

}



genrule {

    name: "hoststubgen_framework-minus-apex_apis.csv",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_apis.csv}",

    ],

    out: ["hoststubgen_framework-minus-apex_apis.csv"],

}



genrule {

    name: "hoststubgen_framework-minus-apex_keep_all.txt",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_keep_all.txt}",

    ],

    out: ["hoststubgen_framework-minus-apex_keep_all.txt"],

}



genrule {

    name: "hoststubgen_framework-minus-apex_dump.txt",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_dump.txt}",

    ],

    out: ["hoststubgen_framework-minus-apex_dump.txt"],

}



java_library {

    name: "services.core-for-hoststubgen",

    installable: false, // host only jar.
@@ -325,6 +225,9 @@ java_genrule { 
    ],

}



// TODO(b/313930116) This jarjar is a bit slow. We should use hoststubgen for renaming,

// but services.core.ravenwood has complex dependencies, so it'll take more than

// just using hoststubgen "rename"s.

java_library {

    name: "services.core.ravenwood-jarjar",

    defaults: ["ravenwood-internal-only-visibility-java"],
@@ -337,7 +240,6 @@ java_library { 


// Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically.

// Rename some of the dependencies to make sure they're included in the intended order.

// Also apply jarjar.

java_library {

    name: "100-framework-minus-apex.ravenwood",

    defaults: ["ravenwood-internal-only-visibility-java"],

api/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ packages_to_document = [ 
// These are libs from framework-internal-utils that are required (i.e. being referenced)

// from framework-non-updatable-sources. Add more here when there's a need.

// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular

// dependencies gets bigger.

// dependencies when the list gets bigger.

android_non_updatable_stubs_libs = [

    "android.hardware.cas-V1.2-java",

    "android.hardware.health-V1.0-java-constants",
@@ -384,6 +384,11 @@ non_updatable_api_deps_on_modules = [ 
    "sdk_system_current_android",

]



java_defaults {

    name: "module-classpath-java-defaults",

    libs: non_updatable_api_deps_on_modules,

}



// Defaults with module APIs in the classpath (mostly from prebuilts).

// Suitable for compiling android-non-updatable.

stubs_defaults {

api/StubLibraries.bp

+29 −230

File changed.

Preview size limit exceeded, changes collapsed.

api/api.go

+0 −81
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
package api



import (

	"fmt"

	"sort"

	"strings"



	"github.com/google/blueprint/proptools"
@@ -464,79 +462,6 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_ 
	}

}



func createApiContributionDefaults(ctx android.LoadHookContext, modules []string) {

	defaultsSdkKinds := []android.SdkKind{

		android.SdkPublic, android.SdkSystem, android.SdkModule,

	}

	for _, sdkKind := range defaultsSdkKinds {

		props := defaultsProps{}

		props.Name = proptools.StringPtr(

			sdkKind.DefaultJavaLibraryName() + "_contributions")

		if sdkKind == android.SdkModule {

			props.Name = proptools.StringPtr(

				sdkKind.DefaultJavaLibraryName() + "_contributions_full")

		}

		props.Api_surface = proptools.StringPtr(sdkKind.String())

		apiSuffix := ""

		if sdkKind != android.SdkPublic {

			apiSuffix = "." + strings.ReplaceAll(sdkKind.String(), "-", "_")

		}

		props.Api_contributions = transformArray(

			modules, "", fmt.Sprintf(".stubs.source%s.api.contribution", apiSuffix))

		props.Defaults_visibility = []string{"//visibility:public"}

		props.Previous_api = proptools.StringPtr(":android.api.combined." + sdkKind.String() + ".latest")

		ctx.CreateModule(java.DefaultsFactory, &props)

	}

}



func createFullApiLibraries(ctx android.LoadHookContext) {

	javaLibraryNames := []string{

		"android_stubs_current",

		"android_system_stubs_current",

		"android_test_stubs_current",

		"android_test_frameworks_core_stubs_current",

		"android_module_lib_stubs_current",

		"android_system_server_stubs_current",

	}



	for _, libraryName := range javaLibraryNames {

		props := libraryProps{}

		props.Name = proptools.StringPtr(libraryName)

		staticLib := libraryName + ".from-source"

		if ctx.Config().BuildFromTextStub() {

			staticLib = libraryName + ".from-text"

		}

		props.Static_libs = []string{staticLib}

		props.Defaults = []string{"android.jar_defaults"}

		props.Visibility = []string{"//visibility:public"}

		props.Is_stubs_module = proptools.BoolPtr(true)



		ctx.CreateModule(java.LibraryFactory, &props)

	}

}



func createFullExportableApiLibraries(ctx android.LoadHookContext) {

	javaLibraryNames := []string{

		"android_stubs_current_exportable",

		"android_system_stubs_current_exportable",

		"android_test_stubs_current_exportable",

		"android_module_lib_stubs_current_exportable",

		"android_system_server_stubs_current_exportable",

	}



	for _, libraryName := range javaLibraryNames {

		props := libraryProps{}

		props.Name = proptools.StringPtr(libraryName)

		staticLib := libraryName + ".from-source"

		props.Static_libs = []string{staticLib}

		props.Defaults = []string{"android.jar_defaults"}

		props.Visibility = []string{"//visibility:public"}

		props.Is_stubs_module = proptools.BoolPtr(true)



		ctx.CreateModule(java.LibraryFactory, &props)

	}

}



func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) {

	bootclasspath := a.bootclasspath(ctx)

	system_server_classpath := a.systemServerClasspath(ctx)
@@ -562,12 +487,6 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { 
	createMergedAnnotationsFilegroups(ctx, bootclasspath, system_server_classpath)



	createPublicStubsSourceFilegroup(ctx, bootclasspath)



	createApiContributionDefaults(ctx, bootclasspath)



	createFullApiLibraries(ctx)



	createFullExportableApiLibraries(ctx)

}



func combinedApisModuleFactory() android.Module {