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
This commit is contained in:
Treehugger Robot
2022-02-09 13:09:01 +00:00
committed by Automerger Merge Worker

View File

@@ -35,7 +35,6 @@ java_defaults {
min_sdk_version: "Tiramisu", min_sdk_version: "Tiramisu",
defaults: [ defaults: [
"framework-module-defaults", "framework-module-defaults",
"enable-framework-connectivity-t-targets",
], ],
srcs: [ srcs: [
":framework-connectivity-tiramisu-updatable-sources", ":framework-connectivity-tiramisu-updatable-sources",
@@ -85,6 +84,7 @@ java_sdk_library {
name: "framework-connectivity-tiramisu", name: "framework-connectivity-tiramisu",
defaults: [ defaults: [
"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. // 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 // The jarjar rules are only so that references to jarjared utils in