commit 0c19e66e2d2cc6339edab65e1438d57e7bb8f1a4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 04 04:58:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 04 04:58:46 2022 +0000
tree e05ee40e0a6ed9ec689f122bb4f77a9614f50586
parent 4f6d11e04f12f0b9316893db4508a119915f374a
parent a9fa050bdcb9bd61b84beb7a9d6f1986ed9dde0a

Merge "Only use framework-connectivity stubs for -t stubs" am: a9fa050bdc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2173584

Change-Id: I4cde28a2f9e4510fc1b00e5399865989fb6a6b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

framework-t/Android.bp

diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index f18c419..2e49307 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -43,14 +43,9 @@
         ":framework-connectivity-tiramisu-updatable-sources",
         ":framework-nearby-java-sources",
     ],
-    stub_only_libs: [
-        // Use prebuilt framework-connectivity stubs to avoid circular dependencies
-        "sdk_module-lib_current_framework-connectivity",
-    ],
     libs: [
         "unsupportedappusage",
         "app-compat-annotations",
-        "sdk_module-lib_current_framework-connectivity",
     ],
     impl_only_libs: [
         // The build system will use framework-bluetooth module_current stubs, because
@@ -104,6 +99,13 @@
     // The jarjar rules are only so that references to jarjared utils in
     // framework-connectivity-pre-jarjar match at runtime.
     jarjar_rules: ":framework-connectivity-jarjar-rules",
+    stub_only_libs: [
+        // Use prebuilt framework-connectivity stubs to avoid circular dependencies
+        "sdk_module-lib_current_framework-connectivity",
+    ],
+    libs: [
+        "sdk_module-lib_current_framework-connectivity",
+    ],
     permitted_packages: [
         "android.app.usage",
         "android.net",