Move NetworkStackClient lib to NetworkStack folder

The AIDLs and ipmemorystore-client were already statically linked
libraries, so their location in the source tree does not change anything
(they were already built into the NetworkStack module and the
framework). It makes more sense to have them in the NetworkStack module
folder however, as changes to these files will be released with the same
cadence as the module, not the framework.

This CL creates a new directory and well-defined static library for the
AIDL interface with the NetworkStack, and Java classes used as the
interface

Bug: 139106271
Test: built, flashed, WiFi working
Test: atest FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I821b476411287b5cbdf09c82e07bd9ed4889f60d

1 files changed, 92 insertions, 0 deletions

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
new file mode 100644
index 0000000..ccb3f45
--- /dev/null
+++ b/common/networkstackclient/Android.bp
@@ -0,0 +1,92 @@
+//
+// Copyright (C) 2018 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.
+//
+
+// AIDL interfaces between the core system and the networking mainline module.
+aidl_interface {
+    name: "ipmemorystore-aidl-interfaces",
+    local_include_dir: "src",
+    srcs: [
+        "src/android/net/IIpMemoryStore.aidl",
+        "src/android/net/IIpMemoryStoreCallbacks.aidl",
+        "src/android/net/ipmemorystore/**/*.aidl",
+    ],
+    backend: {
+        ndk: {
+            enabled: false,
+        },
+        cpp: {
+            enabled: false,
+        },
+    },
+    api_dir: "aidl/ipmemorystore",
+    versions: [
+        "1",
+        "2",
+        "3",
+    ],
+}
+
+aidl_interface {
+    name: "networkstack-aidl-interfaces",
+    local_include_dir: "src",
+    include_dirs: ["frameworks/base/core/java"], // For framework parcelables.
+    srcs: [
+        "src/android/net/DhcpResultsParcelable.aidl",
+        "src/android/net/INetworkMonitor.aidl",
+        "src/android/net/INetworkMonitorCallbacks.aidl",
+        "src/android/net/INetworkStackConnector.aidl",
+        "src/android/net/INetworkStackStatusCallback.aidl",
+        "src/android/net/InitialConfigurationParcelable.aidl",
+        "src/android/net/NattKeepalivePacketDataParcelable.aidl",
+        "src/android/net/PrivateDnsConfigParcel.aidl",
+        "src/android/net/ProvisioningConfigurationParcelable.aidl",
+        "src/android/net/TcpKeepalivePacketDataParcelable.aidl",
+        "src/android/net/dhcp/DhcpServingParamsParcel.aidl",
+        "src/android/net/dhcp/IDhcpServer.aidl",
+        "src/android/net/dhcp/IDhcpServerCallbacks.aidl",
+        "src/android/net/ip/IIpClient.aidl",
+        "src/android/net/ip/IIpClientCallbacks.aidl",
+    ],
+    backend: {
+        ndk: {
+            enabled: false,
+        },
+        cpp: {
+            enabled: false,
+        },
+    },
+    api_dir: "aidl/networkstack",
+    imports: ["ipmemorystore-aidl-interfaces"],
+    versions: [
+        "1",
+        "2",
+        "3",
+    ],
+}
+
+java_library {
+    name: "networkstack-client",
+    sdk_version: "system_current",
+    srcs: [
+        ":framework-annotations",
+        "src/android/net/IpMemoryStoreClient.java",
+        "src/android/net/ipmemorystore/**/*.java",
+    ],
+    static_libs: [
+        "ipmemorystore-aidl-interfaces-V3-java",
+        "networkstack-aidl-interfaces-V3-java",
+    ],
+}