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

Commit 6d0a6803 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ms07-movestats" am: 942c713c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895044

Change-Id: I85d704b09dac07e91b8400a2bbd15867e2b80d6d
parents 27383c90 942c713c

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ filegroup { 
        // Java/AIDL sources under frameworks/base

        ":framework-annotations",

        ":framework-blobstore-sources",

        ":framework-connectivity-nsd-sources",

        ":framework-connectivity-tiramisu-sources",

        ":framework-core-sources",

        ":framework-drm-sources",

        ":framework-graphics-nonupdatable-sources",

packages/ConnectivityT/framework-t/Android.bp

+64 −4
Original line number Diff line number Diff line
@@ -19,11 +19,58 @@ package { 
    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/DataUsage*.*",

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

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

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

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

        "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/**/*.java",

        "src/**/*.aidl",

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

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

    ],

    path: "src",

    visibility: [
@@ -34,7 +81,7 @@ filegroup { 
filegroup {

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

    srcs: [

        "aidl-export/**/*.aidl",

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

    ],

    path: "aidl-export",

    visibility: [
@@ -48,6 +95,19 @@ filegroup { 
        ":framework-connectivity-nsd-internal-sources",

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

    ],

    visibility: [

        "//visibility:private",

    ],

}



// Connectivity-T common libraries.



filegroup {

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

    srcs: [

        ":framework-connectivity-netstats-sources",

        ":framework-connectivity-nsd-sources",

    ],

    visibility: [

        "//frameworks/base",

    ],