Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 am: e2c7f0103e am: 954160f749 (fc97737b) · Commits · e / os / android_frameworks_base

packages/Connectivity/framework/Android.bp

+35 −0

Original line number	Diff line number	Diff line
		@@ -83,3 +83,38 @@ java_sdk_library {
		],
		permitted_packages: ["android.net", "com.android.connectivity.aidl"],
		}

		java_library {
		name: "framework-connectivity.impl",
		// Instead of building against private API (framework.jar),
		// build against core_platform + framework-minus-apex + module
		// stub libs. This allows framework.jar to depend on this library,
		// so it can be part of the private API until all clients have been migrated.
		// TODO: just build against module_api, and remove this jar from
		// the private API.
		sdk_version: "core_platform",
		srcs: [
		":framework-connectivity-sources",
		],
		aidl: {
		include_dirs: [
		"frameworks/base/core/java", // For framework parcelables
		"frameworks/native/aidl/binder", // For PersistableBundle.aidl
		],
		},
		libs: [
		"framework-minus-apex",
		// TODO: just framework-tethering, framework-wifi when building against module_api
		"framework-tethering.stubs.module_lib",
		"framework-wifi.stubs.module_lib",
		"unsupportedappusage",
		"ServiceConnectivityResources",
		],
		static_libs: [
		"net-utils-device-common",
		],
		jarjar_rules: "jarjar-rules.txt",
		apex_available: ["com.android.tethering"],
		installable: true,
		permitted_packages: ["android.net", "com.android.connectivity.aidl"],
		}

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		rule com.android.net.module.util.** android.net.connectivity.framework.util.@1

		# TODO (b/149403767): remove the annotations from net-utils-device-common instead of here
		zap android.annotation.**
		zap com.android.net.module.annotation.**
		zap com.android.internal.annotations.**