commit e9370c5ef42b20cc24e3d1b518c53e3100013562
author Remi NGUYEN VAN <reminv@google.com> Thu Jan 27 11:41:26 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 27 11:41:26 2022 +0000
tree 0457f7a76f0b3b46183f89bf136c7f50b6ae1208
parent ce0df5a6ed12561a2d092b35f46ac6a56795194e
parent f24553d950d87457d8c3fc532c244ab2650e0275

Merge "Add var to enable/disable tethering next APEX"

Tethering/apex/Android.bp

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",