Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee27a947 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Move NetworkStack AIDLs 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.

Bug: 139106271
Test: built, flashed, WiFi working
Change-Id: I886acae850a5e8a9a7bc3ca8aac8690d681ca2cd
parent 4339cf34

services/net/Android.bp

+1 −78
Original line number Diff line number Diff line 
// AIDL interfaces between the core system and the networking mainline module.

aidl_interface {

    name: "ipmemorystore-aidl-interfaces",

    local_include_dir: "java",

    srcs: [

        "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/ipmemorystore",

    versions: [

        "1",

        "2",

        "3",

    ],

}



aidl_interface {

    name: "networkstack-aidl-interfaces",

    local_include_dir: "java",

    include_dirs: ["frameworks/base/core/java"], // For framework parcelables.

    srcs: [

        "java/android/net/DhcpResultsParcelable.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/NattKeepalivePacketDataParcelable.aidl",

        "java/android/net/PrivateDnsConfigParcel.aidl",

        "java/android/net/ProvisioningConfigurationParcelable.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",

    ],

    backend: {

        ndk: {

            enabled: false,

        },

        cpp: {

            enabled: false,

        },

    },

    api_dir: "aidl/networkstack",

    imports: ["ipmemorystore-aidl-interfaces"],

    versions: [

        "1",

        "2",

        "3",

    ],

}



java_library_static {

    name: "services.net",

    srcs: ["java/**/*.java"],

    static_libs: [

        "dnsresolver_aidl_interface-V2-java",

        "ipmemorystore-client",

        "netd_aidl_interface-java",

        "networkstack-aidl-interfaces-V3-java",

    ],

}



java_library_static {

    name: "ipmemorystore-client",

    sdk_version: "system_current",

    srcs: [

        ":framework-annotations",

        "java/android/net/IpMemoryStoreClient.java",

        "java/android/net/ipmemorystore/**/*.java",

    ],

    static_libs: [

        "ipmemorystore-aidl-interfaces-V3-java",

        "networkstack-client",

    ],

}

services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
package android.net;

interface IIpMemoryStore {

  oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener);

  oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener);

  oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener);

  oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener);

  oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener);

  oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener);

}

services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
package android.net;

interface IIpMemoryStoreCallbacks {

  oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore);

}

services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
package android.net.ipmemorystore;

parcelable Blob {

  byte[] data;

}

services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
package android.net.ipmemorystore;

interface IOnBlobRetrievedListener {

  oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data);

}