commit 9548c8580c0bedad6ae78f6fec96cab924dffcf2
author markchien <markchien@google.com> Tue May 05 17:42:44 2020 +0800
committer markchien <markchien@google.com> Thu May 07 14:21:49 2020 +0800
tree 2e67fad3b196e5fded51e7f8789a5239f4ce4a98
parent 0439c2d2047aad6fb4e740e28c4cf62ced5baf35

Override tethering module APK-in-APEX for Go variant

Bug: 155604224
Test: build
Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index bfb6524..83f761f 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -109,6 +109,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 24df5f6..20ccd2a 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",
+    ],
+}