Snap for 11104212 from 6947720e40b0b566cec222163e11de73510dcc20 to 24Q1-release (02fc267e) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+27 −1

Original line number	Diff line number	Diff line
		@@ -58,11 +58,11 @@ aconfig_srcjars = [
		":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
		":com.android.net.flags-aconfig-java{.generated_srcjars}",
		":device_policy_aconfig_flags_lib{.generated_srcjars}",
		":service-jobscheduler-deviceidle.flags-aconfig-java{.generated_srcjars}",
		":surfaceflinger_flags_java_lib{.generated_srcjars}",
		":android.view.contentcapture.flags-aconfig-java{.generated_srcjars}",
		":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",
		":android.tracing.flags-aconfig-java{.generated_srcjars}",
		":android.appwidget.flags-aconfig-java{.generated_srcjars}",
		]

		filegroup {
		@@ -108,6 +108,11 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		cc_aconfig_library {
		name: "telephony_flags_c_lib",
		aconfig_declarations: "telephony_flags",
		}

		// Window
		aconfig_declarations {
		name: "com.android.window.flags.window-aconfig",
		@@ -220,6 +225,7 @@ java_aconfig_library {
		name: "android.security.flags-aconfig-java-host",
		aconfig_declarations: "android.security.flags-aconfig",
		host_supported: true,
		mode: "test",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		@@ -249,6 +255,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.os.flags-aconfig-java-host",
		aconfig_declarations: "android.os.flags-aconfig",
		host_supported: true,
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// VirtualDeviceManager
		java_aconfig_library {
		name: "android.companion.virtual.flags-aconfig-java",
		@@ -722,3 +735,16 @@ java_aconfig_library {
		aconfig_declarations: "android.tracing.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// App Widgets
		aconfig_declarations {
		name: "android.appwidget.flags-aconfig",
		package: "android.appwidget.flags",
		srcs: ["core/java/android/appwidget/flags.aconfig"],
		}

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

INPUT_OWNERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,5 @@ michaelwr@google.com
		prabirmsp@google.com
		svv@google.com
		vdevmurari@google.com

		per-file Virtual*=file:/services/companion/java/com/android/server/companion/virtual/OWNERS

Ravenwood.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ android_ravenwood_libgroup {
		"junit",
		"truth",
		"ravenwood-junit",
		"android.test.mock",
		],
		}

apex/jobscheduler/service/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -13,10 +13,6 @@ java_library {
		name: "service-jobscheduler",
		installable: true,

		defaults: [
		"service-jobscheduler-aconfig-libraries",
		],

		srcs: [
		"java/*/.java",
		":framework-jobscheduler-shared-srcs",
		@@ -32,6 +28,7 @@ java_library {

		static_libs: [
		"modules-utils-fastxmlserializer",
		"service-jobscheduler-job.flags-aconfig-java",
		],

		// Rename classes shared with the framework

apex/jobscheduler/service/aconfig/Android.bp

+0 −17

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ aconfig_declarations {
		java_aconfig_library {
		name: "service-jobscheduler-deviceidle.flags-aconfig-java",
		aconfig_declarations: "service-deviceidle.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		visibility: ["//frameworks/base:__subpackages__"],
		}

		@@ -26,21 +25,5 @@ aconfig_declarations {
		java_aconfig_library {
		name: "service-jobscheduler-job.flags-aconfig-java",
		aconfig_declarations: "service-job.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		visibility: ["//frameworks/base:__subpackages__"],
		}

		service_jobscheduler_aconfig_srcjars = [
		":service-jobscheduler-deviceidle.flags-aconfig-java{.generated_srcjars}",
		":service-jobscheduler-job.flags-aconfig-java{.generated_srcjars}",
		]

		// Aconfig declarations and libraries for the core framework
		java_defaults {
		name: "service-jobscheduler-aconfig-libraries",
		// Add java_aconfig_libraries to here to add them to the core framework
		srcs: service_jobscheduler_aconfig_srcjars,
		// Add aconfig-annotations-lib as a dependency for the optimization
		libs: ["aconfig-annotations-lib"],
		visibility: ["//frameworks/base:__subpackages__"],
		}