From 5fca5ff385d86ccd1a642ae2ae57d00a2e45acdb Mon Sep 17 00:00:00 2001
From: Jinfeng Du <jinfengdu@google.com>
Date: Mon, 30 May 2022 14:37:51 +0000
Subject: [PATCH] Revert "Convert filegroup to library"

Revert "Add dependency on modules-utils-local-log"

Revert submission 2108043-locallog

Reason for revert: b/234350536
Reverted Changes:
I2e873458d:Replace source dependency with library
I95d270e5e:Convert filegroup to library
I17c77d972:Add dependency on modules-utils-local-log
I2e873458d:Replace source dependency with library

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

diff --git a/core/java/Android.bp b/core/java/Android.bp
index f874f9d3db1c4..27f3fc53101cd 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -146,14 +146,11 @@ java_library {
     ],
 }
 
-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
@@ -378,6 +375,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: [
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 1b64d3aaa5614..0c3f1dd3589d5 100644
--- a/services/net/Android.bp
+++ b/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",