[DO NOT MERGE] Disable "next" targets in module release branch
The "next" targets are only used for development builds using
unfinalized SDKs, and are not necessary in the module release
branch.
This should not be (auto)merged in development branches.
Ignore-AOSP-First: module release branch-only change
Change-Id: I8cb64d8bb86b781cd57d1a1a466c56185573fcc2
Test: m
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index e59c8e4..b00b1f5 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -36,16 +36,16 @@
// 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.
}
-enable_tethering_next_apex = true
+enable_tethering_next_apex = false
// This is a placeholder comment to avoid merge conflicts
// as the above target may have different "enabled" values
// depending on the branch