Merge "Add build targets for non-mainline NetworkStack" into qt-dev (678d4ea6) · Commits · e / os / android_frameworks_base

packages/CaptivePortalLogin/Android.bp

+17 −3

Original line number	Diff line number	Diff line
		@@ -14,12 +14,11 @@
		// limitations under the License.
		//

		android_app {
		name: "CaptivePortalLogin",
		java_defaults {
		name: "CaptivePortalLoginDefaults",
		srcs: ["src/*/.java"],
		sdk_version: "system_current",
		min_sdk_version: "28",
		certificate: "networkstack",
		static_libs: [
		"androidx.legacy_legacy-support-v4",
		"metrics-constants-protos",
		@@ -27,3 +26,18 @@ android_app {
		],
		manifest: "AndroidManifest.xml",
		}

		android_app {
		name: "CaptivePortalLogin",
		defaults: ["CaptivePortalLoginDefaults"],
		certificate: "networkstack",
		}

		// Alternative CaptivePortalLogin signed with the platform cert, to use
		// with InProcessNetworkStack.
		android_app {
		name: "PlatformCaptivePortalLogin",
		defaults: ["CaptivePortalLoginDefaults"],
		certificate: "platform",
		overrides: ["CaptivePortalLogin"],
		}

+17 −4

Original line number	Diff line number	Diff line
		@@ -14,15 +14,28 @@
		// limitations under the License.
		//

		// Stub APK to define permissions for NetworkStack
		android_app {
		name: "NetworkPermissionConfig",
		java_defaults {
		name: "NetworkPermissionConfigDefaults",
		// TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without
		// a classes.dex.
		srcs: ["src/*/.java"],
		platform_apis: true,
		min_sdk_version: "28",
		certificate: "networkstack",
		privileged: true,
		manifest: "AndroidManifest.xml",
		}

		// Stub APK to define permissions for NetworkStack
		android_app {
		name: "NetworkPermissionConfig",
		defaults: ["NetworkPermissionConfigDefaults"],
		certificate: "networkstack",
		}

		// Alternative stub APK signed with platform certificate. To use with InProcessNetworkStack.
		android_app {
		name: "PlatformNetworkPermissionConfig",
		defaults: ["NetworkPermissionConfigDefaults"],
		certificate: "platform",
		overrides: ["NetworkPermissionConfig"],
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -98,8 +98,6 @@ java_defaults {
		optimize: {
		proguard_flags_files: ["proguard.flags"],
		},
		// The permission configuration must be included to ensure security of the device
		required: ["NetworkPermissionConfig"],
		}

		// Non-updatable network stack running in the system server process for devices not using the module
		@@ -110,6 +108,8 @@ android_app {
		manifest: "AndroidManifest_InProcess.xml",
		// InProcessNetworkStack is a replacement for NetworkStack
		overrides: ["NetworkStack"],
		// The permission configuration must be included to ensure security of the device
		required: ["PlatformNetworkPermissionConfig"],
		}

		// Updatable network stack packaged as an application
		@@ -119,6 +119,8 @@ android_app {
		certificate: "networkstack",
		manifest: "AndroidManifest.xml",
		use_embedded_native_libs: true,
		// The permission configuration must be included to ensure security of the device
		required: ["NetworkPermissionConfig"],
		}

		genrule {