From 192bf1f1e31ab9014df3c5e9fe88573fdcf3b0bb Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Thu, 5 Sep 2019 22:07:42 -0700 Subject: [PATCH] telephony-stack util API lib attach copyable hidden util API classes to create a jar file containing these, and statically link it from telephony mainline modules. Need to jarjar those classes otherwise classloader will load classes with the same name in boot class path(framework.jar) TODO: some Util APIs like AsyncResult which returned from telephony-common library and used by other apps like Settings. We should decouple Settings from telephony-common first before we make a copy and rename AsyncResult. Bug: 137202333 Test: Manual & Build Change-Id: I81a6948246f1453481962699855560c2f64bb413 --- Android.bp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Android.bp b/Android.bp index 35c7b1bc6fdd..9039611cf72a 100644 --- a/Android.bp +++ b/Android.bp @@ -1485,3 +1485,25 @@ genrule { targets: ["droidcore"], }, } + +// Avoid including Parcelable classes as we don't want to have two copies of +// Parcelable cross the process. +filegroup { + 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" + ], +} +