From 0353bb9da487fde1bcec4c897bb576d671d28d04 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Fri, 8 Jan 2021 18:32:00 +0800 Subject: Create a service-connectivity-pre-jarjar library This is needed for FrameworksNetTests because it inculdes service-connectivity. Without this library, the service-connectivity is already jarjar-ed which will cause the util classes couldn't be found when running the tests. So let the tests inculde the pre-jarjar version and service-connectivity applies the jarjar to this library. Bug: 177046265 Test: FrameworksNetTests Change-Id: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca Merged-In: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca --- Android.bp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 22246f2f4e3c..d5e7cd870e5a 100644 --- a/Android.bp +++ b/Android.bp @@ -834,17 +834,20 @@ filegroup { ], } -// keep these files in sync with the package/Tethering/jarjar-rules.txt for the tethering module. +// keep these files in sync with the package/Tethering/jarjar-rules.txt and +// package/Connectivity/jarjar-rules.txt for the tethering module and connectivity module. filegroup { - name: "framework-tethering-shared-srcs", + name: "framework-connectivity-shared-srcs", srcs: [ "core/java/android/util/LocalLog.java", + // This should be android.util.IndentingPrintWriter, but it's not available in all branches. "core/java/com/android/internal/util/IndentingPrintWriter.java", "core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/MessageUtils.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/TrafficStatsConstants.java", + "core/java/com/android/internal/util/WakeupMessage.java", ], } -- cgit v1.2.3