Conditionally disable TetheringApiCurrentLib

The "current" targets are only necessary in branches that can use
non-stable APIs, and can fail to build otherwise.

Apply ConnectivityNextEnableDefaults so they are disabled on such
branches. Also deprecate NetworkStackNextEnableDefaults, so
ConnectivityNextEnableDefaults is used everywhere.

Bug: 190249673
Test: m
Change-Id: I1b152f3cc22f1bed6444d280f0066e480980e949
This commit is contained in:
Remi NGUYEN VAN 2022-01-26 17:43:53 +09:00
commit f826bce37a
2 changed files with 3 additions and 2 deletions

View file

@ -64,6 +64,7 @@ java_defaults {
android_library {
name: "TetheringApiCurrentLib",
defaults: [
"ConnectivityNextEnableDefaults",
"TetheringAndroidLibraryDefaults",
"TetheringApiLevel"
],
@ -158,7 +159,7 @@ java_defaults {
// Non-updatable tethering running in the system server process for devices not using the module
android_app {
name: "InProcessTethering",
defaults: ["TetheringAppDefaults", "TetheringApiLevel"],
defaults: ["TetheringAppDefaults", "TetheringApiLevel", "ConnectivityNextEnableDefaults"],
static_libs: ["TetheringApiCurrentLib"],
certificate: "platform",
manifest: "AndroidManifest_InProcess.xml",

View file

@ -69,7 +69,7 @@ java_defaults {
// devices.
android_test {
name: "CtsNetTestCases",
defaults: ["CtsNetTestCasesDefaults", "NetworkStackNextEnableDefaults"],
defaults: ["CtsNetTestCasesDefaults", "ConnectivityNextEnableDefaults"],
// TODO: CTS should not depend on the entirety of the networkstack code.
static_libs: [
"NetworkStackApiCurrentLib",