commit 668aff4a8da0dbb9ca9fbe6f5958e0c1fc4f231d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 09 13:09:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 09 13:09:01 2022 +0000
tree a75499b55be4ce76251a2de5820c93f48b83febc
parent c033c24658f888630e89d05c5ef1314b53ce3be1
parent 0ad3becd608aadfb957d6a06515ca7b0d30beebd

Merge changes from topic "split-pre-jarjar" am: 0ad3becd60

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

Change-Id: Ief8218d65f06836fbd5c14fe568f161d3e0b86af

framework-t/Android.bp

diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index bd78e61..f2d9a4a 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -35,7 +35,6 @@
     min_sdk_version: "Tiramisu",
     defaults: [
         "framework-module-defaults",
-        "enable-framework-connectivity-t-targets",
     ],
     srcs: [
         ":framework-connectivity-tiramisu-updatable-sources",
@@ -85,6 +84,7 @@
     name: "framework-connectivity-tiramisu",
     defaults: [
         "framework-connectivity-tiramisu-defaults",
+        "enable-framework-connectivity-t-targets",
     ],
     // Do not add static_libs to this library: put them in framework-connectivity instead.
     // The jarjar rules are only so that references to jarjared utils in