Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main (7df02055) · Commits · e / os / android_frameworks_base

services/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,8 @@ filegroup {
		filegroup {
		name: "services-non-updatable-sources",
		srcs: [
		":incremental_aidl",
		":services.core-aidl-sources",
		":services.core-sources",
		":services.core-sources-am-wm",
		"core/java/com/android/server/am/package.html",
		@@ -356,4 +358,8 @@ non_updatable_exportable_droidstubs {
		},
		},
		api_surface: "system-server",
		sdk_version: "module_current",
		libs: [
		"framework-annotations-lib",
		],
		}

+13 −6

Original line number	Diff line number	Diff line
		@@ -30,6 +30,18 @@ filegroup {
		],
		}

		filegroup {
		name: "services.core-aidl-sources",
		srcs: [
		":dumpstate_aidl",
		":framework_native_aidl",
		":gsiservice_aidl",
		":installd_aidl",
		":storaged_aidl",
		":vold_aidl",
		],
		}

		java_library_static {
		name: "services-config-update",
		srcs: [
		@@ -151,14 +163,9 @@ java_library_static {
		":android.hardware.tv.hdmi.earc-V1-java-source",
		":statslog-art-java-gen",
		":statslog-contexthub-java-gen",
		":services.core-aidl-sources",
		":services.core-sources",
		":services.core.protologsrc",
		":dumpstate_aidl",
		":framework_native_aidl",
		":gsiservice_aidl",
		":installd_aidl",
		":storaged_aidl",
		":vold_aidl",
		":platform-compat-config",
		":platform-compat-overrides",
		":display-device-config",