From 4e8639649acc755a43bf394b749bfd1db33a7cce Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 15 Feb 2021 20:16:28 +0900 Subject: [PATCH] Split parcelable .aidl files to aidl-export The one-line "parcelable X" files need to be imported by targets that do not build against SDK (the SDK has prebuilt definitions), so prepare a dedicated directory for them. This avoids having users of the classes include the whole src/ directory, which could contain definitions for classes that are not part of the public API, so should not be imported. Also move back to frameworks/base/core some .aidl definitions that were separated from their associated class. Bug: 171540887 Test: m Merged-In: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 Change-Id: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 --- .../android/net/ConnectivityMetricsEvent.aidl | 0 .../android/net/InterfaceConfiguration.aidl | 0 .../java}/android/net/UidRange.aidl | 0 packages/Connectivity/framework/Android.bp | 27 +++++++++++++++++-- .../android/net/CaptivePortalData.aidl | 0 .../net/ConnectivityDiagnosticsManager.aidl | 0 .../android/net/DhcpInfo.aidl | 0 .../android/net/IpConfiguration.aidl | 0 .../android/net/IpPrefix.aidl | 0 .../android/net/KeepalivePacketData.aidl | 0 .../android/net/LinkAddress.aidl | 0 .../android/net/LinkProperties.aidl | 0 .../android/net/MacAddress.aidl | 0 .../android/net/Network.aidl | 0 .../android/net/NetworkAgentConfig.aidl | 0 .../android/net/NetworkCapabilities.aidl | 0 .../android/net/NetworkInfo.aidl | 0 .../android/net/NetworkRequest.aidl | 0 .../android/net/ProxyInfo.aidl | 0 .../android/net/RouteInfo.aidl | 0 .../android/net/StaticIpConfiguration.aidl | 0 .../android/net/TestNetworkInterface.aidl | 0 .../android/net/apf/ApfCapabilities.aidl | 0 23 files changed, 25 insertions(+), 2 deletions(-) rename {packages/Connectivity/framework/src => core/java}/android/net/ConnectivityMetricsEvent.aidl (100%) rename {packages/Connectivity/framework/src => core/java}/android/net/InterfaceConfiguration.aidl (100%) rename {packages/Connectivity/framework/src => core/java}/android/net/UidRange.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/CaptivePortalData.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/ConnectivityDiagnosticsManager.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/DhcpInfo.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/IpConfiguration.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/IpPrefix.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/KeepalivePacketData.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/LinkAddress.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/LinkProperties.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/MacAddress.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/Network.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/NetworkAgentConfig.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/NetworkCapabilities.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/NetworkInfo.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/NetworkRequest.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/ProxyInfo.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/RouteInfo.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/StaticIpConfiguration.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/TestNetworkInterface.aidl (100%) rename packages/Connectivity/framework/{src => aidl-export}/android/net/apf/ApfCapabilities.aidl (100%) diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityMetricsEvent.aidl b/core/java/android/net/ConnectivityMetricsEvent.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/ConnectivityMetricsEvent.aidl rename to core/java/android/net/ConnectivityMetricsEvent.aidl diff --git a/packages/Connectivity/framework/src/android/net/InterfaceConfiguration.aidl b/core/java/android/net/InterfaceConfiguration.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/InterfaceConfiguration.aidl rename to core/java/android/net/InterfaceConfiguration.aidl diff --git a/packages/Connectivity/framework/src/android/net/UidRange.aidl b/core/java/android/net/UidRange.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/UidRange.aidl rename to core/java/android/net/UidRange.aidl diff --git a/packages/Connectivity/framework/Android.bp b/packages/Connectivity/framework/Android.bp index 3326ea9eddcb1..ffca971430092 100644 --- a/packages/Connectivity/framework/Android.bp +++ b/packages/Connectivity/framework/Android.bp @@ -14,7 +14,6 @@ // limitations under the License. // -// TODO: use a java_library in the bootclasspath instead package { // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import @@ -24,13 +23,37 @@ package { default_applicable_licenses: ["frameworks_base_license"], } +// TODO: use a java_library in the bootclasspath instead filegroup { - name: "framework-connectivity-sources", + 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__", diff --git a/packages/Connectivity/framework/src/android/net/CaptivePortalData.aidl b/packages/Connectivity/framework/aidl-export/android/net/CaptivePortalData.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/CaptivePortalData.aidl rename to packages/Connectivity/framework/aidl-export/android/net/CaptivePortalData.aidl diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.aidl b/packages/Connectivity/framework/aidl-export/android/net/ConnectivityDiagnosticsManager.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.aidl rename to packages/Connectivity/framework/aidl-export/android/net/ConnectivityDiagnosticsManager.aidl diff --git a/packages/Connectivity/framework/src/android/net/DhcpInfo.aidl b/packages/Connectivity/framework/aidl-export/android/net/DhcpInfo.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/DhcpInfo.aidl rename to packages/Connectivity/framework/aidl-export/android/net/DhcpInfo.aidl diff --git a/packages/Connectivity/framework/src/android/net/IpConfiguration.aidl b/packages/Connectivity/framework/aidl-export/android/net/IpConfiguration.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/IpConfiguration.aidl rename to packages/Connectivity/framework/aidl-export/android/net/IpConfiguration.aidl diff --git a/packages/Connectivity/framework/src/android/net/IpPrefix.aidl b/packages/Connectivity/framework/aidl-export/android/net/IpPrefix.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/IpPrefix.aidl rename to packages/Connectivity/framework/aidl-export/android/net/IpPrefix.aidl diff --git a/packages/Connectivity/framework/src/android/net/KeepalivePacketData.aidl b/packages/Connectivity/framework/aidl-export/android/net/KeepalivePacketData.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/KeepalivePacketData.aidl rename to packages/Connectivity/framework/aidl-export/android/net/KeepalivePacketData.aidl diff --git a/packages/Connectivity/framework/src/android/net/LinkAddress.aidl b/packages/Connectivity/framework/aidl-export/android/net/LinkAddress.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/LinkAddress.aidl rename to packages/Connectivity/framework/aidl-export/android/net/LinkAddress.aidl diff --git a/packages/Connectivity/framework/src/android/net/LinkProperties.aidl b/packages/Connectivity/framework/aidl-export/android/net/LinkProperties.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/LinkProperties.aidl rename to packages/Connectivity/framework/aidl-export/android/net/LinkProperties.aidl diff --git a/packages/Connectivity/framework/src/android/net/MacAddress.aidl b/packages/Connectivity/framework/aidl-export/android/net/MacAddress.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/MacAddress.aidl rename to packages/Connectivity/framework/aidl-export/android/net/MacAddress.aidl diff --git a/packages/Connectivity/framework/src/android/net/Network.aidl b/packages/Connectivity/framework/aidl-export/android/net/Network.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/Network.aidl rename to packages/Connectivity/framework/aidl-export/android/net/Network.aidl diff --git a/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.aidl b/packages/Connectivity/framework/aidl-export/android/net/NetworkAgentConfig.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/NetworkAgentConfig.aidl rename to packages/Connectivity/framework/aidl-export/android/net/NetworkAgentConfig.aidl diff --git a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.aidl b/packages/Connectivity/framework/aidl-export/android/net/NetworkCapabilities.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/NetworkCapabilities.aidl rename to packages/Connectivity/framework/aidl-export/android/net/NetworkCapabilities.aidl diff --git a/packages/Connectivity/framework/src/android/net/NetworkInfo.aidl b/packages/Connectivity/framework/aidl-export/android/net/NetworkInfo.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/NetworkInfo.aidl rename to packages/Connectivity/framework/aidl-export/android/net/NetworkInfo.aidl diff --git a/packages/Connectivity/framework/src/android/net/NetworkRequest.aidl b/packages/Connectivity/framework/aidl-export/android/net/NetworkRequest.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/NetworkRequest.aidl rename to packages/Connectivity/framework/aidl-export/android/net/NetworkRequest.aidl diff --git a/packages/Connectivity/framework/src/android/net/ProxyInfo.aidl b/packages/Connectivity/framework/aidl-export/android/net/ProxyInfo.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/ProxyInfo.aidl rename to packages/Connectivity/framework/aidl-export/android/net/ProxyInfo.aidl diff --git a/packages/Connectivity/framework/src/android/net/RouteInfo.aidl b/packages/Connectivity/framework/aidl-export/android/net/RouteInfo.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/RouteInfo.aidl rename to packages/Connectivity/framework/aidl-export/android/net/RouteInfo.aidl diff --git a/packages/Connectivity/framework/src/android/net/StaticIpConfiguration.aidl b/packages/Connectivity/framework/aidl-export/android/net/StaticIpConfiguration.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/StaticIpConfiguration.aidl rename to packages/Connectivity/framework/aidl-export/android/net/StaticIpConfiguration.aidl diff --git a/packages/Connectivity/framework/src/android/net/TestNetworkInterface.aidl b/packages/Connectivity/framework/aidl-export/android/net/TestNetworkInterface.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/TestNetworkInterface.aidl rename to packages/Connectivity/framework/aidl-export/android/net/TestNetworkInterface.aidl diff --git a/packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.aidl b/packages/Connectivity/framework/aidl-export/android/net/apf/ApfCapabilities.aidl similarity index 100% rename from packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.aidl rename to packages/Connectivity/framework/aidl-export/android/net/apf/ApfCapabilities.aidl