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

Commit 9580d5b0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge changes from topic "conn_t_move_master" 

* changes:
  Remove stale aidl-export references
  Move ConnectivityT to packages/modules
parents 83bd93ae cb106302

Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -327,8 +327,6 @@ java_defaults { 
        include_dirs: [

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "frameworks/native/libs/permission/aidl",

            // TODO: remove when moved to the below package

            "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "packages/modules/Media/apex/aidl/stable",
@@ -586,8 +584,6 @@ stubs_defaults { 
        include_dirs: [

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "frameworks/native/libs/permission/aidl",

            // TODO: remove when moved to the below package

            "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "packages/modules/Media/apex/aidl/stable",

packages/ConnectivityT/OWNERS

deleted100644 → 0
+0 −5
Original line number Original line Diff line number Diff line 
# OWNERS block for code move: b/222234190

reminv@google.com



# file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking

# per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS

packages/ConnectivityT/framework-t/Android.bp

deleted100644 → 0
+0 −205
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2021 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.

//



package {

    // See: http://go/android-license-faq

    default_applicable_licenses: ["Android-Apache-2.0"],

}



// NetworkStats related libraries.



filegroup {

    name: "framework-connectivity-netstats-internal-sources",

    srcs: [

        "src/android/app/usage/*.java",

        "src/android/net/DataUsageRequest.*",

        "src/android/net/INetworkStatsService.aidl",

        "src/android/net/INetworkStatsSession.aidl",

        "src/android/net/NetworkIdentity.java",

        "src/android/net/NetworkIdentitySet.java",

        "src/android/net/NetworkStateSnapshot.*",

        "src/android/net/NetworkStats.*",

        "src/android/net/NetworkStatsAccess.*",

        "src/android/net/NetworkStatsCollection.*",

        "src/android/net/NetworkStatsHistory.*",

        "src/android/net/NetworkTemplate.*",

        "src/android/net/TrafficStats.java",

        "src/android/net/UnderlyingNetworkInfo.*",

        "src/android/net/netstats/**/*.*",

    ],

    path: "src",

    visibility: [

        "//visibility:private",

    ],

}



filegroup {

    name: "framework-connectivity-netstats-aidl-export-sources",

    srcs: [

        "aidl-export/android/net/NetworkStats.aidl",

        "aidl-export/android/net/NetworkTemplate.aidl",

    ],

    path: "aidl-export",

    visibility: [

        "//visibility:private",

    ],

}



filegroup {

    name: "framework-connectivity-netstats-sources",

    srcs: [

        ":framework-connectivity-netstats-internal-sources",

        ":framework-connectivity-netstats-aidl-export-sources",

    ],

    visibility: [

        "//visibility:private",

    ],

}



// Nsd related libraries.



filegroup {

    name: "framework-connectivity-nsd-internal-sources",

    srcs: [

        "src/android/net/nsd/*.aidl",

        "src/android/net/nsd/*.java",

    ],

    path: "src",

    visibility: [

        "//visibility:private",

    ],

}



filegroup {

    name: "framework-connectivity-nsd-aidl-export-sources",

    srcs: [

        "aidl-export/android/net/nsd/*.aidl",

    ],

    path: "aidl-export",

    visibility: [

        "//visibility:private",

    ],

}



filegroup {

    name: "framework-connectivity-nsd-sources",

    srcs: [

        ":framework-connectivity-nsd-internal-sources",

        ":framework-connectivity-nsd-aidl-export-sources",

    ],

    visibility: [

        "//visibility:private",

    ],

}



// IpSec related libraries.



filegroup {

    name: "framework-connectivity-ipsec-sources",

    srcs: [

        "src/android/net/IIpSecService.aidl",

        "src/android/net/IpSec*.*",

    ],

    path: "src",

    visibility: [

        "//visibility:private",

    ],

}



// Ethernet related libraries.



filegroup {

    name: "framework-connectivity-ethernet-sources",

    srcs: [

        "src/android/net/EthernetManager.java",

        "src/android/net/EthernetNetworkManagementException.java",

        "src/android/net/EthernetNetworkManagementException.aidl",

        "src/android/net/EthernetNetworkSpecifier.java",

        "src/android/net/EthernetNetworkUpdateRequest.java",

        "src/android/net/EthernetNetworkUpdateRequest.aidl",

        "src/android/net/IEthernetManager.aidl",

        "src/android/net/IEthernetServiceListener.aidl",

        "src/android/net/INetworkInterfaceOutcomeReceiver.aidl",

        "src/android/net/ITetheredInterfaceCallback.aidl",

    ],

    path: "src",

    visibility: [

        "//visibility:private",

    ],

}



// Connectivity-T common libraries.



filegroup {

    name: "framework-connectivity-tiramisu-internal-sources",

    srcs: [

        "src/android/net/ConnectivityFrameworkInitializerTiramisu.java",

    ],

    path: "src",

    visibility: [

        "//visibility:private",

    ],

}



// TODO: remove this empty filegroup.

filegroup {

    name: "framework-connectivity-tiramisu-sources",

    srcs: [],

    visibility: ["//frameworks/base"],

}



filegroup {

    name: "framework-connectivity-tiramisu-updatable-sources",

    srcs: [

        ":framework-connectivity-ethernet-sources",

        ":framework-connectivity-ipsec-sources",

        ":framework-connectivity-netstats-sources",

        ":framework-connectivity-nsd-sources",

        ":framework-connectivity-tiramisu-internal-sources",

    ],

    visibility: [

        "//frameworks/base",

        "//packages/modules/Connectivity:__subpackages__",

    ],

}



cc_library_shared {

    name: "libframework-connectivity-tiramisu-jni",

    min_sdk_version: "30",

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

        // Don't warn about S API usage even with

        // min_sdk 30: the library is only loaded

        // on S+ devices

        "-Wno-unguarded-availability",

        "-Wthread-safety",

    ],

    srcs: [

        "jni/android_net_TrafficStats.cpp",

        "jni/onload.cpp",

    ],

    shared_libs: [

        "libandroid",

        "liblog",

        "libnativehelper",

    ],

    stl: "none",

    apex_available: [

        "com.android.tethering",

    ],

}

packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkStats.aidl

deleted100644 → 0
+0 −19
Original line number Original line Diff line number Diff line 
/**

 * Copyright (c) 2011, 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.

 */



package android.net;



parcelable NetworkStats;

packages/ConnectivityT/framework-t/aidl-export/android/net/NetworkTemplate.aidl

deleted100644 → 0
+0 −19
Original line number Original line Diff line number Diff line 
/**

 * Copyright (c) 2011, 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.

 */



package android.net;



parcelable NetworkTemplate;