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

Commit 955068b7 authored by Jinfeng Du's avatar Jinfeng Du Committed by Automerger Merge Worker
Browse files

Merge "Revert "Convert filegroup to library"" am: 0801f800 am: 53d695ed am: c2f6a875 

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



Change-Id: I9c4a7940af31c4e0ffe07caec13261673d945554
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b78f190b c2f6a875

core/java/Android.bp

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

}



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

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

filegroup {

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

    srcs: [

        "android/util/LocalLog.java",

    ],

}



// keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -414,6 +411,15 @@ 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 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ java_library_static { 
java_library {

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

    srcs: [

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

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

    ],

    sdk_version: "module_current",