Skip to content
Snippets Groups Projects
Commit 699477a8 authored by paulhu's avatar paulhu Committed by Paul Hu
Browse files

Rename framework-connectivity-tiramisu to framework-connectivity-t

Bug: 215434166
Ignore-AOSP-First: Merge conflict. Will cherry-pick to AOSP afterwards.
Test: build, flash, device boot to home.
Merged-In: I9ebedf8813cbfa30d979bc35a3b2306715be682b
Change-Id: I9ebedf8813cbfa30d979bc35a3b2306715be682b
parent dfa8d7ec
No related branches found
No related tags found
No related merge requests found
......@@ -50,7 +50,7 @@ java_defaults {
],
libs: [
"framework-connectivity",
"framework-connectivity-tiramisu.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
"framework-statsd.stubs.module_lib",
"framework-tethering.impl",
"framework-wifi",
......
......@@ -107,7 +107,7 @@ bootclasspath_fragment {
name: "com.android.tethering-bootclasspath-fragment",
contents: [
"framework-connectivity",
"framework-connectivity-tiramisu",
"framework-connectivity-t",
"framework-tethering",
],
apex_available: ["com.android.tethering"],
......
......@@ -34,7 +34,7 @@ java_library {
libs: [
"framework-minus-apex",
"framework-connectivity.impl",
"framework-connectivity-tiramisu.impl",
"framework-connectivity-t.impl",
"framework-tethering.impl",
],
visibility: [
......@@ -69,7 +69,7 @@ java_defaults {
"framework-res",
"framework-bluetooth.stubs.module_lib",
"framework-connectivity.impl",
"framework-connectivity-tiramisu.impl",
"framework-connectivity-t.impl",
"framework-tethering.impl",
"framework-wifi.stubs.module_lib",
],
......
......@@ -30,7 +30,7 @@ java_defaults {
// T, and were moved to the module in T. Other bootclasspath classes in connectivity should go to
// framework-connectivity.
java_defaults {
name: "framework-connectivity-tiramisu-defaults",
name: "framework-connectivity-t-defaults",
sdk_version: "module_current",
min_sdk_version: "Tiramisu",
defaults: [
......@@ -78,8 +78,8 @@ java_defaults {
}
java_library {
name: "framework-connectivity-tiramisu-pre-jarjar",
defaults: ["framework-connectivity-tiramisu-defaults"],
name: "framework-connectivity-t-pre-jarjar",
defaults: ["framework-connectivity-t-defaults"],
libs: [
"framework-bluetooth",
"framework-wifi",
......@@ -92,9 +92,9 @@ java_library {
// T, and were moved to the module in T. Other bootclasspath classes in connectivity should go to
// framework-connectivity.
java_sdk_library {
name: "framework-connectivity-tiramisu",
name: "framework-connectivity-t",
defaults: [
"framework-connectivity-tiramisu-defaults",
"framework-connectivity-t-defaults",
"enable-framework-connectivity-t-targets",
],
// Do not add static_libs to this library: put them in framework-connectivity instead.
......
......@@ -77,7 +77,7 @@ java_defaults {
],
},
stub_only_libs: [
"framework-connectivity-tiramisu.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
],
impl_only_libs: [
"framework-tethering.stubs.module_lib",
......@@ -90,7 +90,7 @@ java_defaults {
"modules-utils-preconditions",
],
libs: [
"framework-connectivity-tiramisu.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
"unsupportedappusage",
],
apex_available: [
......
......@@ -19,10 +19,10 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
// This builds T+ services depending on framework-connectivity-tiramisu
// This builds T+ services depending on framework-connectivity-t
// hidden symbols separately from the S+ services, to ensure that S+
// services cannot accidentally depend on T+ hidden symbols from
// framework-connectivity-tiramisu.
// framework-connectivity-t.
java_library {
name: "service-connectivity-tiramisu-pre-jarjar",
sdk_version: "system_server_current",
......@@ -35,7 +35,7 @@ java_library {
libs: [
"framework-annotations-lib",
"framework-connectivity-pre-jarjar",
"framework-connectivity-tiramisu-pre-jarjar",
"framework-connectivity-t-pre-jarjar",
"framework-tethering.stubs.module_lib",
"service-connectivity-pre-jarjar",
"service-nearby",
......
......@@ -100,7 +100,7 @@ java_library {
libs: [
"framework-annotations-lib",
"framework-connectivity-pre-jarjar",
"framework-connectivity-tiramisu.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
"framework-tethering.stubs.module_lib",
"framework-wifi.stubs.module_lib",
"unsupportedappusage",
......
......@@ -115,7 +115,7 @@ java_defaults {
// meaning @hide APIs in framework-connectivity are resolved before @SystemApi
// stubs in framework
"framework-connectivity.impl",
"framework-connectivity-tiramisu.impl",
"framework-connectivity-t.impl",
"framework-tethering.impl",
"framework",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment