Merge "telephony-stack util API lib" am: 91e1a00846

am: 70ac0bd904

Change-Id: I01fdf88e548f4f0fd65302e2d87844948ab576cb

1 files changed, 20 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 6b2883c13b9d..100f70d0f2dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1575,14 +1575,33 @@ genrule {
     },
 }
 
+filegroup {
+    name: "framework-cellbroadcast-shared-srcs",
+    srcs: [
+        "core/java/android/util/LocalLog.java",
+        "core/java/android/util/Slog.java",
+        "core/java/com/android/internal/util/State.java",
+        "core/java/com/android/internal/util/StateMachine.java",
+    ],
+}
+
 // Avoid including Parcelable classes as we don't want to have two copies of
 // Parcelable cross the process.
 filegroup {
-    name: "framework-cellbroadcast-shared-srcs",
+    name: "framework-telephony-stack-shared-srcs",
     srcs: [
+        "core/java/android/os/RegistrantList.java",
+        "core/java/android/os/Registrant.java",
         "core/java/android/util/LocalLog.java",
         "core/java/android/util/Slog.java",
+        "core/java/android/util/TimeUtils.java",
+        "core/java/com/android/internal/os/SomeArgs.java",
+        "core/java/com/android/internal/util/Preconditions.java",
         "core/java/com/android/internal/util/State.java",
         "core/java/com/android/internal/util/StateMachine.java",
+        "core/java/com/android/internal/util/XmlUtils.java",
+        "core/java/com/android/internal/util/HexDump.java",
+        "core/java/com/android/internal/util/IndentingPrintWriter.java",
+        "core/java/com/android/internal/util/DumpUtils.java"
     ],
 }