Merge "Compile NetworkStack resources only once" (4aea5629) · Commits · e / os / android_frameworks_base

packages/NetworkStack/Android.bp

+20 −17

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

			java_defaults {
			name: "NetworkStackCommon",
			sdk_version: "system_current",
			min_sdk_version: "28",
			}

	// Library including the network stack, used to compile both variants of the network stack		// Library including the network stack, used to compile both variants of the network stack
	android_library {		android_library {
	name: "NetworkStackBase",		name: "NetworkStackBase",
	sdk_version: "system_current",		defaults: ["NetworkStackCommon"],
	min_sdk_version: "28",
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	":framework-networkstack-shared-srcs",		":framework-networkstack-shared-srcs",
	@@ -34,34 +39,32 @@ android_library {
	manifest: "AndroidManifestBase.xml",		manifest: "AndroidManifestBase.xml",
	}		}

	// Non-updatable in-process network stack for devices not using the module		java_defaults {
	android_app {		name: "NetworkStackAppCommon",
	name: "InProcessNetworkStack",		defaults: ["NetworkStackCommon"],
	sdk_version: "system_current",
	min_sdk_version: "28",
	certificate: "platform",
	privileged: true,		privileged: true,
	static_libs: [		static_libs: [
	"NetworkStackBase",		"NetworkStackBase",
	],		],
			// Resources already included in NetworkStackBase
			resource_dirs: [],
	jarjar_rules: "jarjar-rules-shared.txt",		jarjar_rules: "jarjar-rules-shared.txt",
	// The permission configuration must be included to ensure security of the device		// The permission configuration must be included to ensure security of the device
	required: ["NetworkStackPermissionStub"],		required: ["NetworkStackPermissionStub"],
			}

			// Non-updatable network stack running in the system server process for devices not using the module
			android_app {
			name: "InProcessNetworkStack",
			defaults: ["NetworkStackAppCommon"],
			certificate: "platform",
	manifest: "AndroidManifest_InProcess.xml",		manifest: "AndroidManifest_InProcess.xml",
	}		}

	// Updatable network stack packaged as an application		// Updatable network stack packaged as an application
	android_app {		android_app {
	name: "NetworkStack",		name: "NetworkStack",
	sdk_version: "system_current",		defaults: ["NetworkStackAppCommon"],
	min_sdk_version: "28",
	certificate: "networkstack",		certificate: "networkstack",
	privileged: true,
	static_libs: [
	"NetworkStackBase"
	],
	jarjar_rules: "jarjar-rules-shared.txt",
	// The permission configuration must be included to ensure security of the device
	required: ["NetworkStackPermissionStub"],
	manifest: "AndroidManifest.xml",		manifest: "AndroidManifest.xml",
	}		}