Snap for 11449429 from 7fcf82fb6311ddff0710228143530e1b635d6491 to 24Q2-release (5b1dbb7d) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ aconfig_srcjars = [
		":com.android.internal.pm.pkg.component.flags-aconfig-java{.generated_srcjars}",
		":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
		":com.android.media.flags.editing-aconfig-java{.generated_srcjars}",
		":com.android.media.flags.projection-aconfig-java{.generated_srcjars}",
		":com.android.net.thread.flags-aconfig-java{.generated_srcjars}",
		":com.android.server.flags.services-aconfig-java{.generated_srcjars}",
		":com.android.text.flags-aconfig-java{.generated_srcjars}",
		@@ -566,6 +567,21 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// MediaProjection
		aconfig_declarations {
		name: "com.android.media.flags.projection-aconfig",
		package: "com.android.media.projection.flags",
		srcs: [
		"media/java/android/media/flags/projection.aconfig",
		],
		}

		java_aconfig_library {
		name: "com.android.media.flags.projection-aconfig-java",
		aconfig_declarations: "com.android.media.flags.projection-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Media TV
		aconfig_declarations {
		name: "android.media.tv.flags-aconfig",

Ravenwood.bp

+21 −4

Original line number	Diff line number	Diff line
		@@ -93,16 +93,33 @@ 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.
		java_genrule {
		name: "100-framework-minus-apex.ravenwood",
		cmd: "cp $(in) $(out)",
		srcs: [":framework-minus-apex.ravenwood"],
		out: ["100-framework-minus-apex.ravenwood.jar"],
		visibility: ["//visibility:private"],
		}

		java_genrule {
		// Use 200 to make sure it comes before the mainline stub ("all-updatable...").
		name: "200-kxml2-android",
		cmd: "cp $(in) $(out)",
		srcs: [":kxml2-android"],
		out: ["200-kxml2-android.jar"],
		visibility: ["//visibility:private"],
		}

		android_ravenwood_libgroup {
		name: "ravenwood-runtime",
		libs: [
		// Prefixed with "200" to ensure it's sorted early in Tradefed classpath
		// so that we provide a concrete implementation before Mainline stubs
		"100-framework-minus-apex.ravenwood",
		"200-kxml2-android",
		"all-updatable-modules-system-stubs",
		"android.test.mock.ravenwood",
		"framework-minus-apex.ravenwood",
		"hoststubgen-helper-framework-runtime.ravenwood",
		"ravenwood-helper-runtime",
		"hoststubgen-helper-runtime.ravenwood",

		// Provide runtime versions of utils linked in below

api/StubLibraries.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,7 @@ java_defaults {
		java_version: "1.8",
		compile_dex: true,
		visibility: ["//visibility:public"],
		is_stubs_module: true,
		}

		java_defaults {
		@@ -233,6 +234,7 @@ java_defaults {
		system_modules: "none",
		java_version: "1.8",
		compile_dex: true,
		is_stubs_module: true,
		}

		java_defaults {
		@@ -716,6 +718,7 @@ java_library {
		// with its own package-private android.annotation.Nullable.
		"private-stub-annotations-jar",
		],
		is_stubs_module: true,
		}

		java_genrule {
		@@ -779,6 +782,7 @@ java_defaults {
		// annotations found, thus should exist inside android.jar.
		"private-stub-annotations-jar",
		],
		is_stubs_module: true,
		}

		// Listing of API domains contribution and dependencies per API surfaces

api/api.go

+18 −5

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ type libraryProps struct {
		Static_libs []string
		Visibility []string
		Defaults []string
		Is_stubs_module *bool
		}

		type fgProps struct {
		@@ -241,6 +242,7 @@ func createMergedPublicStubs(ctx android.LoadHookContext, modules []string) {
		props.Static_libs = transformArray(modules, "", ".stubs")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		@@ -250,6 +252,7 @@ func createMergedPublicExportableStubs(ctx android.LoadHookContext, modules []st
		props.Static_libs = transformArray(modules, "", ".stubs.exportable")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		@@ -262,6 +265,7 @@ func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) {
		props.Static_libs = transformArray(updatable_modules, "", ".stubs.system")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}
		// Now merge all-updatable-modules-system-stubs and stubs from non-updatable modules
		@@ -273,6 +277,7 @@ func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) {
		props.Static_libs = append(props.Static_libs, "all-updatable-modules-system-stubs")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}
		}
		@@ -286,6 +291,7 @@ func createMergedSystemExportableStubs(ctx android.LoadHookContext, modules []st
		props.Static_libs = transformArray(updatable_modules, "", ".stubs.exportable.system")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}
		// Now merge all-updatable-modules-system-stubs and stubs from non-updatable modules
		@@ -297,6 +303,7 @@ func createMergedSystemExportableStubs(ctx android.LoadHookContext, modules []st
		props.Static_libs = append(props.Static_libs, "all-updatable-modules-system-stubs-exportable")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}
		}
		@@ -307,6 +314,7 @@ func createMergedTestStubsForNonUpdatableModules(ctx android.LoadHookContext) {
		props.Static_libs = transformArray(non_updatable_modules, "", ".stubs.test")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		@@ -316,6 +324,7 @@ func createMergedTestExportableStubsForNonUpdatableModules(ctx android.LoadHookC
		props.Static_libs = transformArray(non_updatable_modules, "", ".stubs.exportable.test")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		@@ -359,6 +368,7 @@ func createMergedFrameworkModuleLibExportableStubs(ctx android.LoadHookContext,
		props.Static_libs = transformArray(modules, "", ".stubs.exportable.module_lib")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		@@ -372,6 +382,7 @@ func createMergedFrameworkModuleLibStubs(ctx android.LoadHookContext, modules []
		props.Static_libs = transformArray(modules, "", ".stubs.module_lib")
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		props.Is_stubs_module = proptools.BoolPtr(true)
		ctx.CreateModule(java.LibraryFactory, &props)
		}

		@@ -472,6 +483,7 @@ func createFullApiLibraries(ctx android.LoadHookContext) {
		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)
		}
		@@ -493,6 +505,7 @@ func createFullExportableApiLibraries(ctx android.LoadHookContext) {
		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)
		}

core/api/current.txt

+118 −16

File changed.

Preview size limit exceeded, changes collapsed.