Merge "Revert "Convert filegroup to library"" am: 0801f8008b am: 53d695ed20 am: c2f6a875bd am: 955068b7b4

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

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

core/java/Android.bp

@@ -171,14 +171,11 @@ java_library {
     static_libs: ["modules-utils-uieventlogger-interface"],
 }
 
-java_library {
+filegroup {
-    name: "modules-utils-locallog",
+    name: "framework-services-net-module-wifi-shared-srcs",
-    srcs: ["android/util/LocalLog.java"],
+    srcs: [
-    libs: ["unsupportedappusage"],
+        "android/util/LocalLog.java",
-    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
@@ -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

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