commit bfd392c4c0b638ff85b93f58b3a0d7a60e1a4fa7
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 08 12:11:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 08 12:11:47 2020 +0000
tree 9ea38c772b01c30e7b81bbeeadf9c09e659f9e15
parent 974d6f5978853c3f102dae926dce6cddeafac866
parent dbaff66f45dde8c34c4a358646a14e5351f3f147

Merge "Override tethering module APK-in-APEX for Go variant"

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 21b67c6..29660a9 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -113,6 +113,7 @@
     manifest: "AndroidManifest_InProcess.xml",
     // InProcessTethering is a replacement for Tethering
     overrides: ["Tethering"],
+    apex_available: ["com.android.tethering"],
 }
 
 // Updatable tethering packaged as an application

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index a328fbe..67097a7 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -36,3 +36,12 @@
     name: "com.android.tethering.certificate",
     certificate: "com.android.tethering",
 }
+
+override_apex {
+    name: "com.android.tethering.inprocess",
+    base: "com.android.tethering",
+    package_name: "com.android.tethering.inprocess",
+    apps: [
+        "InProcessTethering",
+    ],
+}