DO NOT MERGE: disable connectivity-tiramisu build
Disable framework-connectivity-tiramisu and do not include it in the apex, and add empty filegroups and replacement stub classes to make service-connectivity-tiramisu only contain ConnectivityServiceInitializer. This allows continuing to build the com.android.tethering APEX in the S release branch, while minimizing build conflicts as T classes are being prepared to move to it. Bug: 206893064 Test: m com.android.tethering Ignore-AOSP-First: sc-mainline-prod only. Change-Id: I0c4e29568eadb6ef85ddadebbb37723adb9f29cd
This commit is contained in:
@@ -88,7 +88,7 @@ bootclasspath_fragment {
|
||||
name: "com.android.tethering-bootclasspath-fragment",
|
||||
contents: [
|
||||
"framework-connectivity",
|
||||
"framework-connectivity-tiramisu",
|
||||
// Changed in sc-mainline-prod only: no framework-connectivity-tiramisu
|
||||
"framework-tethering",
|
||||
],
|
||||
apex_available: ["com.android.tethering"],
|
||||
@@ -111,11 +111,13 @@ bootclasspath_fragment {
|
||||
// modified by the Soong or platform compat team.
|
||||
hidden_api: {
|
||||
max_target_r_low_priority: [
|
||||
"hiddenapi/hiddenapi-max-target-r-loprio.txt",
|
||||
// Changed in sc-mainline-prod only: no list for
|
||||
// framework-connectivity-tiramisu APIs as it is not in the APEX
|
||||
],
|
||||
max_target_o_low_priority: [
|
||||
"hiddenapi/hiddenapi-max-target-o-low-priority.txt",
|
||||
"hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt",
|
||||
// Changed in sc-mainline-prod only: no list for
|
||||
// framework-connectivity-tiramisu APIs as it is not in the APEX
|
||||
],
|
||||
unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user