Snap for 7929046 from 4b13766007f37d9b306bef456ab0a3347e48ecc1 to mainline-adbd-release (cbcf179f) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+42 −13

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,17 @@ package {
	default_applicable_licenses: ["Android-Apache-2.0"],		default_applicable_licenses: ["Android-Apache-2.0"],
	}		}

			// Defaults to enable/disable java targets that depend on
			// NetworkStackNext, which uses development APIs. "enabled" may
			// have a different value depending on the branch.
			java_defaults {
			name: "NetworkStackNextEnableDefaults",
			enabled: true,
			}
			// This is a placeholder comment to avoid merge conflicts
			// as the above target may have different "enabled" values
			// depending on the branch

	java_defaults {		java_defaults {
	name: "NetworkStackDevApiLevel",		name: "NetworkStackDevApiLevel",
	min_sdk_version: "29",		min_sdk_version: "29",
	@@ -68,7 +79,7 @@ java_defaults {
	name: "NetworkStackShimsDefaults",		name: "NetworkStackShimsDefaults",
	libs: [		libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"networkstack-client",		"networkstack-aidl-latest",
	],		],
	static_libs : [		static_libs : [
	"modules-utils-build_system"		"modules-utils-build_system"
	@@ -119,7 +130,7 @@ java_library {
	sdk_version: "system_30",		sdk_version: "system_30",
	visibility: ["//visibility:private"],		visibility: ["//visibility:private"],
	lint: {		lint: {
	baseline_filename: "lint-baseline-api-30-shims.xml",		strict_updatability_linting: true,
	},		},
	}		}

	@@ -214,8 +225,10 @@ java_defaults {
	libs: ["unsupportedappusage"],		libs: ["unsupportedappusage"],
	static_libs: [		static_libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
			"modules-utils-build_system",
			"modules-utils-preconditions",
			"modules-utils-statemachine",
	"netd_aidl_interface-lateststable-java",		"netd_aidl_interface-lateststable-java",
	"netlink-client",
	"networkstack-client",		"networkstack-client",
	"net-utils-framework-common",		"net-utils-framework-common",
	// See note on statsprotos when adding/updating proto build rules		// See note on statsprotos when adding/updating proto build rules
	@@ -223,6 +236,7 @@ java_defaults {
	"statsprotos",		"statsprotos",
	"captiveportal-lib",		"captiveportal-lib",
	"net-utils-device-common",		"net-utils-device-common",
			"net-utils-device-common-netlink",
	],		],
	plugins: ["java_api_finder"],		plugins: ["java_api_finder"],
	}		}
	@@ -230,7 +244,11 @@ java_defaults {
	// The versions of the android library containing network stack code compiled for each SDK variant.		// The versions of the android library containing network stack code compiled for each SDK variant.
	android_library {		android_library {
	name: "NetworkStackApiCurrentLib",		name: "NetworkStackApiCurrentLib",
	defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],		defaults: [
			"NetworkStackDevApiLevel",
			"NetworkStackAndroidLibraryDefaults",
			"NetworkStackNextEnableDefaults",
			],
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	":statslog-networkstack-java-gen-current"		":statslog-networkstack-java-gen-current"
	@@ -244,9 +262,7 @@ android_library {
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
	],		],
	lint: {		lint: { strict_updatability_linting: true },
	baseline_filename: "lint-baseline-current-lib.xml",
	},
	}		}

	android_library {		android_library {
	@@ -267,9 +283,7 @@ android_library {
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
	],		],
	lint: {		lint: { strict_updatability_linting: true },
	baseline_filename: "lint-baseline-stable-lib.xml",
	},
	}		}

	filegroup {		filegroup {
	@@ -278,6 +292,7 @@ filegroup {
	visibility: [		visibility: [
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
			"//packages/modules/Connectivity/tests:__subpackages__",
	"//packages/modules/Connectivity/Tethering/tests/integration",		"//packages/modules/Connectivity/Tethering/tests/integration",
	]		]
	}		}
	@@ -302,7 +317,11 @@ java_defaults {
	// Non-updatable network stack running in the system server process for devices not using the module		// Non-updatable network stack running in the system server process for devices not using the module
	android_app {		android_app {
	name: "InProcessNetworkStack",		name: "InProcessNetworkStack",
	defaults: [ "NetworkStackAppDefaults", "NetworkStackDevApiLevel"],		defaults: [
			"NetworkStackAppDefaults",
			"NetworkStackDevApiLevel",
			"NetworkStackNextEnableDefaults",
			],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],
	certificate: "platform",		certificate: "platform",
	manifest: "AndroidManifest_InProcess.xml",		manifest: "AndroidManifest_InProcess.xml",
	@@ -320,7 +339,11 @@ android_app {
	// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top		// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
	android_library {		android_library {
	name: "NetworkStackNextManifestBase",		name: "NetworkStackNextManifestBase",
	defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],		defaults: [
			"NetworkStackAppDefaults",
			"NetworkStackDevApiLevel",
			"NetworkStackNextEnableDefaults",
			],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],
	manifest: "AndroidManifest.xml"		manifest: "AndroidManifest.xml"
	}		}
	@@ -328,7 +351,11 @@ android_library {
	// NetworkStack build targeting the current API release, for testing on in-development SDK		// NetworkStack build targeting the current API release, for testing on in-development SDK
	android_app {		android_app {
	name: "NetworkStackNext",		name: "NetworkStackNext",
	defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],		defaults: [
			"NetworkStackAppDefaults",
			"NetworkStackDevApiLevel",
			"NetworkStackNextEnableDefaults",
			],
	static_libs: ["NetworkStackNextManifestBase"],		static_libs: ["NetworkStackNextManifestBase"],
	certificate: "networkstack",		certificate: "networkstack",
	manifest: "AndroidManifest_Next.xml",		manifest: "AndroidManifest_Next.xml",
	@@ -337,6 +364,7 @@ android_app {
	"NetworkPermissionConfig",		"NetworkPermissionConfig",
	"privapp_whitelist_com.android.networkstack",		"privapp_whitelist_com.android.networkstack",
	],		],
			lint: { strict_updatability_linting: true },
	}		}

	// Updatable network stack for finalized API		// Updatable network stack for finalized API
	@@ -352,6 +380,7 @@ android_app {
	"privapp_whitelist_com.android.networkstack",		"privapp_whitelist_com.android.networkstack",
	],		],
	updatable: true,		updatable: true,
			lint: { strict_updatability_linting: true },
	}		}

	cc_library_shared {		cc_library_shared {

AndroidManifest.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	android:sharedUserId="android.uid.networkstack"		android:sharedUserId="android.uid.networkstack"
	android:versionCode="319999900"		android:versionCode="319999900"
	android:versionName="s_aml_319999900"		android:versionName="s_aml_319999900"
			coreApp="true"
	>		>
	<!-- Permissions must be defined here, and not in the base manifest, as the network stack		<!-- Permissions must be defined here, and not in the base manifest, as the network stack
	running in the system server process does not need any permission, and having privileged		running in the system server process does not need any permission, and having privileged

AndroidManifest_InProcess.xml

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,8 @@
	<manifest xmlns:android="http://schemas.android.com/apk/res/android"		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
	package="com.android.networkstack.inprocess"		package="com.android.networkstack.inprocess"
	android:sharedUserId="android.uid.system"		android:sharedUserId="android.uid.system"
	android:process="system">		android:process="system"
			coreApp="true">
	<application>		<application>
	<service android:name="com.android.server.NetworkStackService"		<service android:name="com.android.server.NetworkStackService"
	android:process="system"		android:process="system"

AndroidManifest_Next.xml

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,5 +18,6 @@
	package="com.android.networkstack"		package="com.android.networkstack"
	android:sharedUserId="android.uid.networkstack"		android:sharedUserId="android.uid.networkstack"
	android:versionCode="320000000"		android:versionCode="320000000"
	android:versionName="T-next">		android:versionName="T-next"
			coreApp="true">
	</manifest>		</manifest>

OWNERS

+2 −8

Original line number	Original line	Diff line number	Diff line
	codewiz@google.com		set noparent
	jchalard@google.com		file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
	junyulai@google.com
	lorenzo@google.com
	maze@google.com
	reminv@google.com
	satk@google.com
	xiaom@google.com