From e4fcdec29f0a689ca0b289a3b24077cc439a7394 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 27 May 2022 15:04:45 +0000
Subject: [PATCH] Convert filegroup to library

This filegroup makes more sense as a standalone modules-utils library,
and can be migrated to the modules-utils repository. Remove the
unnecessary dependency from services.net-module-wifi.

Test: m
Change-Id: I95d270e5e885fc40bd21af693058ace9818f1e3e
---
 core/java/Android.bp    | 22 ++++++++--------------
 services/net/Android.bp |  1 -
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index 27f3fc53101cd..f874f9d3db1c4 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -146,11 +146,14 @@ java_library {
     ],
 }
 
-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"],
+    visibility: ["//visibility:public"],
 }
 
 // keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -375,15 +378,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: [
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 0c3f1dd3589d5..1b64d3aaa5614 100644
--- a/services/net/Android.bp
+++ b/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",