Remove packages/Connectivity. (f69a7d09) · Commits · e / os / android_frameworks_base

Android.bp

+8 −7

Original line number	Diff line number	Diff line
		@@ -284,10 +284,11 @@ java_defaults {
		generate_get_transaction_name: true,
		local_include_dirs: [
		"media/aidl",
		// TODO: move to include_dirs when migrated to packages/modules
		"packages/Connectivity/framework/aidl-export",
		],
		include_dirs: ["frameworks/av/aidl"],
		include_dirs: [
		"frameworks/av/aidl",
		"packages/modules/Connectivity/framework/aidl-export",
		],
		},
		dxflags: [
		"--core-library",
		@@ -524,12 +525,12 @@ stubs_defaults {
		local_include_dirs: [
		"apex/media/aidl/stable",
		"media/aidl",
		// TODO: move to include-dirs for packages/modules/Connectivity when this moves out of
		// frameworks/base
		"packages/Connectivity/framework/aidl-export",
		"telephony/java",
		],
		include_dirs: ["frameworks/av/aidl"],
		include_dirs: [
		"frameworks/av/aidl",
		"packages/modules/Connectivity/framework/aidl-export",
		],
		},
		// These are libs from framework-internal-utils that are required (i.e. being referenced)
		// from framework-non-updatable-sources. Add more here when there's a need.

packages/Connectivity/OWNERS

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		# Placing an OWNERS block to perform migration
		# detailed in b/186628461
		baligh@google.com

packages/Connectivity/TEST_MAPPING

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		{
		"imports": [
		{
		"path": "frameworks/base/core/java/android/net"
		},
		{
		"path": "packages/modules/NetworkStack"
		},
		{
		"path": "packages/modules/CaptivePortalLogin"
		},
		{
		"path": "packages/modules/Connectivity"
		},
		{
		"path": "packages/modules/Connectivity/Tethering"
		}
		]
		}
		No newline at end of file

packages/Connectivity/framework/Android.bp

deleted100644 → 0

+0 −165

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2020 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_base_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "framework-connectivity-internal-sources",
		srcs: [
		"src/*/.java",
		"src/*/.aidl",
		],
		path: "src",
		visibility: [
		"//visibility:private",
		],
		}

		filegroup {
		name: "framework-connectivity-aidl-export-sources",
		srcs: [
		"aidl-export/*/.aidl",
		],
		path: "aidl-export",
		visibility: [
		"//visibility:private",
		],
		}

		// TODO: use a java_library in the bootclasspath instead
		filegroup {
		name: "framework-connectivity-sources",
		srcs: [
		":framework-connectivity-internal-sources",
		":framework-connectivity-aidl-export-sources",
		],
		visibility: [
		"//frameworks/base",
		"//packages/modules/Connectivity:__subpackages__",
		],
		}

		java_library {
		name: "framework-connectivity-annotations",
		sdk_version: "module_current",
		srcs: [
		"src/android/net/ConnectivityAnnotations.java",
		],
		libs: [
		"framework-annotations-lib",
		"framework-connectivity",
		],
		visibility: [
		"//frameworks/base:__subpackages__",
		"//packages/modules/Connectivity:__subpackages__",
		],
		}

		java_sdk_library {
		name: "framework-connectivity",
		sdk_version: "module_current",
		min_sdk_version: "30",
		defaults: ["framework-module-defaults"],
		installable: true,
		srcs: [
		":framework-connectivity-sources",
		":net-utils-framework-common-srcs",
		],
		aidl: {
		include_dirs: [
		// Include directories for parcelables that are part of the stable API, and need a
		// one-line "parcelable X" .aidl declaration to be used in AIDL interfaces.
		// TODO(b/180293679): remove these dependencies as they should not be necessary once
		// the module builds against API (the parcelable declarations exist in framework.aidl)
		"frameworks/base/core/java", // For framework parcelables
		"frameworks/native/aidl/binder", // For PersistableBundle.aidl
		],
		},
		impl_only_libs: [
		// TODO (b/183097033) remove once module_current includes core_platform
		"stable.core.platform.api.stubs",
		"framework-tethering.stubs.module_lib",
		"framework-wifi.stubs.module_lib",
		"net-utils-device-common",
		],
		libs: [
		"unsupportedappusage",
		],
		jarjar_rules: "jarjar-rules.txt",
		permitted_packages: ["android.net"],
		impl_library_visibility: [
		"//packages/modules/Connectivity/Tethering/apex",
		// In preparation for future move
		"//packages/modules/Connectivity/apex",
		"//packages/modules/Connectivity/service",
		"//frameworks/base/packages/Connectivity/service",
		"//frameworks/base",

		// Tests using hidden APIs
		"//cts/tests/netlegacy22.api",
		"//external/sl4a:__subpackages__",
		"//frameworks/base/packages/Connectivity/tests:__subpackages__",
		"//frameworks/libs/net/common/testutils",
		"//frameworks/libs/net/common/tests:__subpackages__",
		"//frameworks/opt/telephony/tests/telephonytests",
		"//packages/modules/CaptivePortalLogin/tests",
		"//packages/modules/Connectivity/Tethering/tests:__subpackages__",
		"//packages/modules/Connectivity/tests:__subpackages__",
		"//packages/modules/NetworkStack/tests:__subpackages__",
		"//packages/modules/Wifi/service/tests/wifitests",
		],
		apex_available: [
		"com.android.tethering",
		],
		}

		cc_library_shared {
		name: "libframework-connectivity-jni",
		min_sdk_version: "30",
		cflags: [
		"-Wall",
		"-Werror",
		"-Wno-unused-parameter",
		// Don't warn about S API usage even with
		// min_sdk 30: the library is only loaded
		// on S+ devices
		"-Wno-unguarded-availability",
		"-Wthread-safety",
		],
		srcs: [
		"jni/android_net_NetworkUtils.cpp",
		"jni/onload.cpp",
		],
		shared_libs: [
		"libandroid",
		"liblog",
		"libnativehelper",
		],
		header_libs: [
		"dnsproxyd_protocol_headers",
		],
		stl: "none",
		apex_available: [
		"com.android.tethering",
		],
		}

packages/Connectivity/framework/aidl-export/android/net/CaptivePortalData.aidl

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net;

		@JavaOnlyStableParcelable parcelable CaptivePortalData;