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

Commit d6864b06 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L82300000954861163:N42000001270135524" into tm-mainline-prod 

* changes:
  Use already compiled library
  Make modules-utils-locallog available to platform
  Revert^2 "Convert filegroup to library"
parents 4ad5c6ff bcd6a7d7

core/java/Android.bp

+10 −13
Original line number Diff line number Diff line
@@ -171,11 +171,17 @@ java_library { 
    static_libs: ["modules-utils-uieventlogger-interface"],

}



filegroup {

    name: "framework-services-net-module-wifi-shared-srcs",

    srcs: [

        "android/util/LocalLog.java",

java_library {

    name: "modules-utils-locallog",

    srcs: ["android/util/LocalLog.java"],

    libs: ["unsupportedappusage"],

    sdk_version: "module_current",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

    visibility: ["//visibility:public"],

}



// keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -411,15 +417,6 @@ filegroup { 
    ],

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the process.

filegroup {

    name: "framework-cellbroadcast-shared-srcs",

    srcs: [

        "android/util/LocalLog.java",

    ],

}



java_library {

    name: "modules-utils-statemachine",

    srcs: [

services/net/Android.bp

+1 −13
Original line number Diff line number Diff line
@@ -34,31 +34,19 @@ java_library_static { 
// with dependencies moved to frameworks/libs/net right.

java_library {

    name: "services.net-module-wifi",

    srcs: [

        ":framework-services-net-module-wifi-shared-srcs",

        ":net-utils-services-common-srcs",

    ],

    sdk_version: "module_current",

    min_sdk_version: "30",

    libs: [

        "framework-annotations-lib",

        "unsupportedappusage",

        "framework-wifi-util-lib",

        "framework-connectivity",

        "modules-utils-build_system",

    ],

    static_libs: [

        // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the

        // classes generated by netd_aidl_interfaces-platform-java above.

        "netd_aidl_interface-V3-java",

        "networkstack-client",

        "net-utils-services-common",

    ],

    apex_available: [

        "com.android.wifi",

    ],

    visibility: [

        "//frameworks/opt/net/wifi/service",

        "//frameworks/opt/net/wifi/tests/wifitests",

        "//packages/modules/Wifi/service",

        "//packages/modules/Wifi/service/tests/wifitests",

    ],