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

Commit 75bd2e03 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 0569184d to master"

parents be1fe6f3 404a5266

Android.bp

+0 −60
Original line number Diff line number Diff line
@@ -886,66 +886,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: [

services/net/Android.bp

+58 −0
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: [

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