commit 2fc4ae33ff9625b91a7138034e827443c4aaeb9b
author Anton Hansson <hansson@google.com> Tue May 31 11:30:34 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 31 11:30:34 2022 +0000
tree 4d6a502507621b0a6c4ae1904f0ca8706c5c6147
parent e78fbb48aa6e9cd5998ceac67e6c893465a0ddf9
parent d14ac41736b8db473e2bdd6986e779f2ca9f07e6

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

diff --git a/core/java/Android.bp b/core/java/Android.bp
index 77589a2..b13413a 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -171,11 +171,14 @@
     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"],
+    visibility: ["//visibility:public"],
 }
 
 // keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -411,15 +414,6 @@
     ],
 }
 
-// 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

diff --git a/services/net/Android.bp b/services/net/Android.bp
index 0c3f1dd..1b64d3a 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -35,7 +35,6 @@
 java_library {
     name: "services.net-module-wifi",
     srcs: [
-        ":framework-services-net-module-wifi-shared-srcs",
         ":net-utils-services-common-srcs",
     ],
     sdk_version: "module_current",