[DO NOT MERGE]Disable connectivity target which build with unstable api
Disable the "next" targets which include unstable api because
they could not build in the branch which only have stable sdk.
Test: TH
Ignore-AOSP-First: this is only for sc-mainline-prod only change.
Change-Id: Ic59bf11c85bf80699f00fddcf4610f1a54116d08
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 7863572..d43cf5b 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -22,14 +22,14 @@
// different value depending on the branch.
java_defaults {
name: "ConnectivityNextEnableDefaults",
- enabled: true,
+ enabled: false,
}
apex_defaults {
name: "ConnectivityApexDefaults",
// Tethering app to include in the AOSP apex. Branches that disable the "next" targets may use
// a stable tethering app instead, but will generally override the AOSP apex to use updatable
// package names and keys, so that apex will be unused anyway.
- apps: ["TetheringNext"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
+ apps: ["Tethering"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
}
// This is a placeholder comment to avoid merge conflicts
// as the above target may have different "enabled" values