From 503a0f8af1366dca21d88429927aa49c504b5adb Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 12 Nov 2020 20:03:50 +0800 Subject: [PATCH] Remove unnecessary jarjar rule BasicShellCommandHandler will be interpreted to com.android.connectivity.utils as defined in the jarjar rule for ConnectivityService module but it cannot be applied in cts. ConnectivityService does not need this rule currently. Remove it to fix the missing class issue in the test. Bug: 170598012 Fix: 173097447 Test: atest CtsNetTestCasesLatestSdk FrameworksNetTests Change-Id: I3eff40e7dbee82ab902b0d59a62497f4c55cc2ff --- services/core/Android.bp | 1 - services/core/jarjar-rules.txt | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 services/core/jarjar-rules.txt diff --git a/services/core/Android.bp b/services/core/Android.bp index e9edebd1b670b..fb3c61bc54bce 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -211,7 +211,6 @@ java_library { ":connectivity-service-srcs", ], installable: true, - jarjar_rules: "jarjar-rules.txt", libs: [ "android.net.ipsec.ike", "services.core", diff --git a/services/core/jarjar-rules.txt b/services/core/jarjar-rules.txt deleted file mode 100644 index 58f7bcb1d845f..0000000000000 --- a/services/core/jarjar-rules.txt +++ /dev/null @@ -1,2 +0,0 @@ -# For ConnectivityService module -rule com.android.modules.utils.** com.android.connectivity.utils.@1 \ No newline at end of file