Merge "Add var to enable/disable tethering next APEX" am: e9370c5ef4 am: bbd7155ec0 am: cbe02105ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962623
Change-Id: I34e71f9cee07dc45ef96f3888f623a5a1c782cea
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 611f100..d5049ec 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -31,6 +31,7 @@
// package names and keys, so that apex will be unused anyway.
apps: ["TetheringNext"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
}
+enable_tethering_next_apex = true
// This is a placeholder comment to avoid merge conflicts
// as the above target may have different "enabled" values
// depending on the branch
@@ -141,6 +142,7 @@
name: "com.android.tethering.inprocess",
base: "com.android.tethering",
package_name: "com.android.tethering.inprocess",
+ enabled: enable_tethering_next_apex,
apps: [
"ServiceConnectivityResources",
"InProcessTethering",