From 9fd93192c5d0883372e316c48b7478de15be2dae Mon Sep 17 00:00:00 2001
From: Junyu Lai <junyulai@google.com>
Date: Mon, 17 Jan 2022 10:02:00 +0000
Subject: [PATCH] Create framework-connectivity shared filegroup

Since data usage related code is going to move to mainline module,
hidden classes and methods can no longer be accessed. However,
some of the hidden classes in the platform are still needed, and
cannot be moved because of other callers.

Thus, create a shared srcs filegroup to allow these classes
build with the module to solve the dependencies.

Test: TH
Bug: 204830222
Change-Id: I3813bc2177b2f0b4237056f64c57c63fa29c3081
---
 core/java/Android.bp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index 5649c5f1f7db3..edf9ece4661c6 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -176,6 +176,18 @@ filegroup {
         "com/android/internal/util/IndentingPrintWriter.java",
         "com/android/internal/util/MessageUtils.java",
         "com/android/internal/util/WakeupMessage.java",
+        // TODO: delete as soon as NetworkStatsFactory stops using
+        "com/android/internal/util/ProcFileReader.java",
+    ],
+}
+
+// keep these files in sync with the packages/modules/Connectivity jarjar-rules.txt for
+// the connectivity module.
+filegroup {
+    name: "framework-connectivity-api-shared-srcs",
+    srcs: [
+        "android/util/IndentingPrintWriter.java",
+        "com/android/internal/util/FileRotator.java",
     ],
 }