From b401e58a1e1a995038b2c4b6126d44c1e0f497b3 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Fri, 22 Jan 2021 18:35:00 +0800 Subject: [PATCH] Update sources of Tethering module since it is renamed framework-tethering-shared-srcs is named to framework-connectivity-shared-srcs so update source section to include correct file group. Ignore-AOSP-First: changes in topic has conflicts in sc-dev Bug: 177046265 Test: FrameworksNetTests Change-Id: I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4 Merged-In: I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4 Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a --- Tethering/Android.bp | 2 +- Tethering/jarjar-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tethering/Android.bp b/Tethering/Android.bp index 320ba8f845..4eafc2afa9 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -25,7 +25,7 @@ java_defaults { srcs: [ "apishim/**/*.java", "src/**/*.java", - ":framework-tethering-shared-srcs", + ":framework-connectivity-shared-srcs", ":tethering-module-utils-srcs", ":services-tethering-shared-srcs", ], diff --git a/Tethering/jarjar-rules.txt b/Tethering/jarjar-rules.txt index d1ad569e0d..5de4b97b76 100644 --- a/Tethering/jarjar-rules.txt +++ b/Tethering/jarjar-rules.txt @@ -1,5 +1,5 @@ -# These must be kept in sync with the framework-tethering-shared-srcs filegroup. -# Classes from the framework-tethering-shared-srcs filegroup. +# These must be kept in sync with the framework-connectivity-shared-srcs filegroup. +# Classes from the framework-connectivity-shared-srcs filegroup. # If there are files in that filegroup that are not covered below, the classes in the # module will be overwritten by the ones in the framework. rule com.android.internal.util.** com.android.networkstack.tethering.util.@1