Revert^2 "Convert filegroup to library" am: 4e8ccccbec am: 84ed6576e9 am: 476557fd43 am: d14ac41736

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

Change-Id: Ia551cf094ce8ae9f7ebaf56a01a126ff559dfe86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/Android.bp

@@ -171,11 +171,14 @@ java_library {
     static_libs: ["modules-utils-uieventlogger-interface"],
 }
 
-filegroup {
+java_library {
-    name: "framework-services-net-module-wifi-shared-srcs",
+    name: "modules-utils-locallog",
-    srcs: [
+    srcs: ["android/util/LocalLog.java"],
-        "android/util/LocalLog.java",
+    libs: ["unsupportedappusage"],
-    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: ["//apex_available:anyapex"],
+    visibility: ["//visibility:public"],
 }
 
 // keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -411,15 +414,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

@@ -35,7 +35,6 @@ 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",