From ede75b5f93831baff5fa42721598fa1def03d066 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 20 Mar 2019 21:57:20 +0900 Subject: [PATCH 1/2] Remove the framework dependency on networkstack-aidl-framework. This dependency is unused because the only file it contains is only used by services.net, which already depends on it via the networkstack-aidl-interfaces rule. In its own change because it conflicts in internal master. Test: m Bug: 128804404 Change-Id: Ic4f4c7d2f7de06f75344946345684f26f1e05932 Merged-In: Ic4f4c7d2f7de06f75344946345684f26f1e05932 --- Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.bp b/Android.bp index 1d51da1c14739..ae736b2cb85b2 100644 --- a/Android.bp +++ b/Android.bp @@ -705,7 +705,6 @@ java_defaults { "android.hardware.vibrator-V1.1-java", "android.hardware.vibrator-V1.2-java", "android.hardware.wifi-V1.0-java-constants", - "networkstack-aidl-framework-java", ], required: [ From 306e8cd9e76b25fff83591e50b617dbcca62a14c Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 19 Mar 2019 16:11:26 +0900 Subject: [PATCH 2/2] Move the networkstack AIDL interfaces to services/net. Nothing in the framework uses these, so there is no point in having the build be in frameworks/base/Android.bp. Fix: 128804404 Test: builds, boots Test: atest FrameworksNetTests Change-Id: I2e8c2ad9ea8bfcd3668a83e4c044de10389a8a22 --- Android.bp | 60 ------------------- services/net/Android.bp | 58 ++++++++++++++++++ .../net/ApfCapabilitiesParcelable.aidl | 0 .../android/net/DhcpResultsParcelable.aidl | 0 .../net}/java/android/net/IIpMemoryStore.aidl | 0 .../android/net/IIpMemoryStoreCallbacks.aidl | 0 .../java/android/net/INetworkMonitor.aidl | 0 .../android/net/INetworkMonitorCallbacks.aidl | 0 .../android/net/INetworkStackConnector.aidl | 0 .../net/INetworkStackStatusCallback.aidl | 0 .../net/InitialConfigurationParcelable.aidl | 0 .../android/net/PrivateDnsConfigParcel.aidl | 0 .../ProvisioningConfigurationParcelable.aidl | 0 .../net/StaticIpConfigurationParcelable.aidl | 0 .../net/TcpKeepalivePacketDataParcelable.aidl | 0 .../net/dhcp/DhcpServingParamsParcel.aidl | 0 .../java/android/net/dhcp/IDhcpServer.aidl | 0 .../net/dhcp/IDhcpServerCallbacks.aidl | 0 .../net}/java/android/net/ip/IIpClient.aidl | 0 .../android/net/ip/IIpClientCallbacks.aidl | 0 .../java/android/net/ipmemorystore/Blob.aidl | 0 .../IOnBlobRetrievedListener.aidl | 0 .../IOnL2KeyResponseListener.aidl | 0 .../IOnNetworkAttributesRetrieved.aidl | 0 .../IOnSameNetworkResponseListener.aidl | 0 .../net/ipmemorystore/IOnStatusListener.aidl | 0 .../NetworkAttributesParcelable.aidl | 0 .../SameL3NetworkResponseParcelable.aidl | 0 .../net/ipmemorystore/StatusParcelable.aidl | 0 29 files changed, 58 insertions(+), 60 deletions(-) rename {core => services/net}/java/android/net/ApfCapabilitiesParcelable.aidl (100%) rename {core => services/net}/java/android/net/DhcpResultsParcelable.aidl (100%) rename {core => services/net}/java/android/net/IIpMemoryStore.aidl (100%) rename {core => services/net}/java/android/net/IIpMemoryStoreCallbacks.aidl (100%) rename {core => services/net}/java/android/net/INetworkMonitor.aidl (100%) rename {core => services/net}/java/android/net/INetworkMonitorCallbacks.aidl (100%) rename {core => services/net}/java/android/net/INetworkStackConnector.aidl (100%) rename {core => services/net}/java/android/net/INetworkStackStatusCallback.aidl (100%) rename {core => services/net}/java/android/net/InitialConfigurationParcelable.aidl (100%) rename {core => services/net}/java/android/net/PrivateDnsConfigParcel.aidl (100%) rename {core => services/net}/java/android/net/ProvisioningConfigurationParcelable.aidl (100%) rename {core => services/net}/java/android/net/StaticIpConfigurationParcelable.aidl (100%) rename {core => services/net}/java/android/net/TcpKeepalivePacketDataParcelable.aidl (100%) rename {core => services/net}/java/android/net/dhcp/DhcpServingParamsParcel.aidl (100%) rename {core => services/net}/java/android/net/dhcp/IDhcpServer.aidl (100%) rename {core => services/net}/java/android/net/dhcp/IDhcpServerCallbacks.aidl (100%) rename {core => services/net}/java/android/net/ip/IIpClient.aidl (100%) rename {core => services/net}/java/android/net/ip/IIpClientCallbacks.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/Blob.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/IOnNetworkAttributesRetrieved.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/IOnSameNetworkResponseListener.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/IOnStatusListener.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl (100%) rename {core => services/net}/java/android/net/ipmemorystore/StatusParcelable.aidl (100%) diff --git a/Android.bp b/Android.bp index ae736b2cb85b2..02fc06269b957 100644 --- a/Android.bp +++ b/Android.bp @@ -814,66 +814,6 @@ gensrcs { output_extension: "srcjar", } -// AIDL interfaces between the core system and the networking mainline module. -aidl_interface { - name: "networkstack-aidl-interfaces", - local_include_dir: "core/java", - srcs: [ - "core/java/android/net/ApfCapabilitiesParcelable.aidl", - "core/java/android/net/DhcpResultsParcelable.aidl", - "core/java/android/net/INetworkMonitor.aidl", - "core/java/android/net/INetworkMonitorCallbacks.aidl", - "core/java/android/net/INetworkStackConnector.aidl", - "core/java/android/net/INetworkStackStatusCallback.aidl", - "core/java/android/net/InitialConfigurationParcelable.aidl", - "core/java/android/net/PrivateDnsConfigParcel.aidl", - "core/java/android/net/ProvisioningConfigurationParcelable.aidl", - "core/java/android/net/StaticIpConfigurationParcelable.aidl", - "core/java/android/net/TcpKeepalivePacketDataParcelable.aidl", - "core/java/android/net/dhcp/DhcpServingParamsParcel.aidl", - "core/java/android/net/dhcp/IDhcpServer.aidl", - "core/java/android/net/dhcp/IDhcpServerCallbacks.aidl", - "core/java/android/net/ip/IIpClient.aidl", - "core/java/android/net/ip/IIpClientCallbacks.aidl", - "core/java/android/net/IIpMemoryStore.aidl", - "core/java/android/net/IIpMemoryStoreCallbacks.aidl", - "core/java/android/net/ipmemorystore/**/*.aidl", - ], - backend: { - ndk: { - enabled: false, - }, - cpp: { - enabled: false, - }, - }, - api_dir: "aidl/networkstack", -} - -aidl_interface { - name: "ipmemorystore-aidl-interfaces", - local_include_dir: "core/java", - srcs: [ - "core/java/android/net/IIpMemoryStore.aidl", - "core/java/android/net/IIpMemoryStoreCallbacks.aidl", - "core/java/android/net/ipmemorystore/**/*.aidl", - ], -} - -aidl_interface { - name: "networkstack-aidl-framework", - local_include_dir: "core/java", - srcs: [ - "core/java/android/net/TcpKeepalivePacketDataParcelable.aidl", - ], - api_dir: "aidl/networkstack", - backend: { - java: { - sdk_version: "28", - }, - }, -} - filegroup { name: "framework-annotations", srcs: [ diff --git a/services/net/Android.bp b/services/net/Android.bp index 486d15d918bfb..9e1d44b9faff9 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -1,3 +1,61 @@ +// AIDL interfaces between the core system and the networking mainline module. +aidl_interface { + name: "ipmemorystore-aidl-interfaces", + local_include_dir: "java", + srcs: [ + // TODO: Define and use a filegroup for these files, since they're also used in + // networkstack-aidl-interfaces. This does not appear to work at the moment. + "java/android/net/IIpMemoryStore.aidl", + "java/android/net/IIpMemoryStoreCallbacks.aidl", + "java/android/net/ipmemorystore/**/*.aidl", + ], + backend: { + ndk: { + enabled: false, + }, + cpp: { + enabled: false, + }, + }, + api_dir: "aidl/networkstack", +} + +aidl_interface { + name: "networkstack-aidl-interfaces", + local_include_dir: "java", + include_dirs: ["frameworks/base/core/java"], // For framework parcelables. + srcs: [ + "java/android/net/ApfCapabilitiesParcelable.aidl", + "java/android/net/DhcpResultsParcelable.aidl", + "java/android/net/IIpMemoryStore.aidl", + "java/android/net/IIpMemoryStoreCallbacks.aidl", + "java/android/net/INetworkMonitor.aidl", + "java/android/net/INetworkMonitorCallbacks.aidl", + "java/android/net/INetworkStackConnector.aidl", + "java/android/net/INetworkStackStatusCallback.aidl", + "java/android/net/InitialConfigurationParcelable.aidl", + "java/android/net/PrivateDnsConfigParcel.aidl", + "java/android/net/ProvisioningConfigurationParcelable.aidl", + "java/android/net/StaticIpConfigurationParcelable.aidl", + "java/android/net/TcpKeepalivePacketDataParcelable.aidl", + "java/android/net/dhcp/DhcpServingParamsParcel.aidl", + "java/android/net/dhcp/IDhcpServer.aidl", + "java/android/net/dhcp/IDhcpServerCallbacks.aidl", + "java/android/net/ip/IIpClient.aidl", + "java/android/net/ip/IIpClientCallbacks.aidl", + "java/android/net/ipmemorystore/**/*.aidl", + ], + backend: { + ndk: { + enabled: false, + }, + cpp: { + enabled: false, + }, + }, + api_dir: "aidl/networkstack", +} + java_library_static { name: "services.net", srcs: ["java/**/*.java"], diff --git a/core/java/android/net/ApfCapabilitiesParcelable.aidl b/services/net/java/android/net/ApfCapabilitiesParcelable.aidl similarity index 100% rename from core/java/android/net/ApfCapabilitiesParcelable.aidl rename to services/net/java/android/net/ApfCapabilitiesParcelable.aidl diff --git a/core/java/android/net/DhcpResultsParcelable.aidl b/services/net/java/android/net/DhcpResultsParcelable.aidl similarity index 100% rename from core/java/android/net/DhcpResultsParcelable.aidl rename to services/net/java/android/net/DhcpResultsParcelable.aidl diff --git a/core/java/android/net/IIpMemoryStore.aidl b/services/net/java/android/net/IIpMemoryStore.aidl similarity index 100% rename from core/java/android/net/IIpMemoryStore.aidl rename to services/net/java/android/net/IIpMemoryStore.aidl diff --git a/core/java/android/net/IIpMemoryStoreCallbacks.aidl b/services/net/java/android/net/IIpMemoryStoreCallbacks.aidl similarity index 100% rename from core/java/android/net/IIpMemoryStoreCallbacks.aidl rename to services/net/java/android/net/IIpMemoryStoreCallbacks.aidl diff --git a/core/java/android/net/INetworkMonitor.aidl b/services/net/java/android/net/INetworkMonitor.aidl similarity index 100% rename from core/java/android/net/INetworkMonitor.aidl rename to services/net/java/android/net/INetworkMonitor.aidl diff --git a/core/java/android/net/INetworkMonitorCallbacks.aidl b/services/net/java/android/net/INetworkMonitorCallbacks.aidl similarity index 100% rename from core/java/android/net/INetworkMonitorCallbacks.aidl rename to services/net/java/android/net/INetworkMonitorCallbacks.aidl diff --git a/core/java/android/net/INetworkStackConnector.aidl b/services/net/java/android/net/INetworkStackConnector.aidl similarity index 100% rename from core/java/android/net/INetworkStackConnector.aidl rename to services/net/java/android/net/INetworkStackConnector.aidl diff --git a/core/java/android/net/INetworkStackStatusCallback.aidl b/services/net/java/android/net/INetworkStackStatusCallback.aidl similarity index 100% rename from core/java/android/net/INetworkStackStatusCallback.aidl rename to services/net/java/android/net/INetworkStackStatusCallback.aidl diff --git a/core/java/android/net/InitialConfigurationParcelable.aidl b/services/net/java/android/net/InitialConfigurationParcelable.aidl similarity index 100% rename from core/java/android/net/InitialConfigurationParcelable.aidl rename to services/net/java/android/net/InitialConfigurationParcelable.aidl diff --git a/core/java/android/net/PrivateDnsConfigParcel.aidl b/services/net/java/android/net/PrivateDnsConfigParcel.aidl similarity index 100% rename from core/java/android/net/PrivateDnsConfigParcel.aidl rename to services/net/java/android/net/PrivateDnsConfigParcel.aidl diff --git a/core/java/android/net/ProvisioningConfigurationParcelable.aidl b/services/net/java/android/net/ProvisioningConfigurationParcelable.aidl similarity index 100% rename from core/java/android/net/ProvisioningConfigurationParcelable.aidl rename to services/net/java/android/net/ProvisioningConfigurationParcelable.aidl diff --git a/core/java/android/net/StaticIpConfigurationParcelable.aidl b/services/net/java/android/net/StaticIpConfigurationParcelable.aidl similarity index 100% rename from core/java/android/net/StaticIpConfigurationParcelable.aidl rename to services/net/java/android/net/StaticIpConfigurationParcelable.aidl diff --git a/core/java/android/net/TcpKeepalivePacketDataParcelable.aidl b/services/net/java/android/net/TcpKeepalivePacketDataParcelable.aidl similarity index 100% rename from core/java/android/net/TcpKeepalivePacketDataParcelable.aidl rename to services/net/java/android/net/TcpKeepalivePacketDataParcelable.aidl diff --git a/core/java/android/net/dhcp/DhcpServingParamsParcel.aidl b/services/net/java/android/net/dhcp/DhcpServingParamsParcel.aidl similarity index 100% rename from core/java/android/net/dhcp/DhcpServingParamsParcel.aidl rename to services/net/java/android/net/dhcp/DhcpServingParamsParcel.aidl diff --git a/core/java/android/net/dhcp/IDhcpServer.aidl b/services/net/java/android/net/dhcp/IDhcpServer.aidl similarity index 100% rename from core/java/android/net/dhcp/IDhcpServer.aidl rename to services/net/java/android/net/dhcp/IDhcpServer.aidl diff --git a/core/java/android/net/dhcp/IDhcpServerCallbacks.aidl b/services/net/java/android/net/dhcp/IDhcpServerCallbacks.aidl similarity index 100% rename from core/java/android/net/dhcp/IDhcpServerCallbacks.aidl rename to services/net/java/android/net/dhcp/IDhcpServerCallbacks.aidl diff --git a/core/java/android/net/ip/IIpClient.aidl b/services/net/java/android/net/ip/IIpClient.aidl similarity index 100% rename from core/java/android/net/ip/IIpClient.aidl rename to services/net/java/android/net/ip/IIpClient.aidl diff --git a/core/java/android/net/ip/IIpClientCallbacks.aidl b/services/net/java/android/net/ip/IIpClientCallbacks.aidl similarity index 100% rename from core/java/android/net/ip/IIpClientCallbacks.aidl rename to services/net/java/android/net/ip/IIpClientCallbacks.aidl diff --git a/core/java/android/net/ipmemorystore/Blob.aidl b/services/net/java/android/net/ipmemorystore/Blob.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/Blob.aidl rename to services/net/java/android/net/ipmemorystore/Blob.aidl diff --git a/core/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl rename to services/net/java/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl diff --git a/core/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl rename to services/net/java/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl diff --git a/core/java/android/net/ipmemorystore/IOnNetworkAttributesRetrieved.aidl b/services/net/java/android/net/ipmemorystore/IOnNetworkAttributesRetrieved.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/IOnNetworkAttributesRetrieved.aidl rename to services/net/java/android/net/ipmemorystore/IOnNetworkAttributesRetrieved.aidl diff --git a/core/java/android/net/ipmemorystore/IOnSameNetworkResponseListener.aidl b/services/net/java/android/net/ipmemorystore/IOnSameNetworkResponseListener.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/IOnSameNetworkResponseListener.aidl rename to services/net/java/android/net/ipmemorystore/IOnSameNetworkResponseListener.aidl diff --git a/core/java/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/java/android/net/ipmemorystore/IOnStatusListener.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/IOnStatusListener.aidl rename to services/net/java/android/net/ipmemorystore/IOnStatusListener.aidl diff --git a/core/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl rename to services/net/java/android/net/ipmemorystore/NetworkAttributesParcelable.aidl diff --git a/core/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl rename to services/net/java/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl diff --git a/core/java/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/java/android/net/ipmemorystore/StatusParcelable.aidl similarity index 100% rename from core/java/android/net/ipmemorystore/StatusParcelable.aidl rename to services/net/java/android/net/ipmemorystore/StatusParcelable.aidl