summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author markchien <markchien@google.com> 2020-05-05 17:42:44 +0800
committer Mark Chien <markchien@google.com> 2020-05-07 06:35:05 +0000
commit1440776eb12d6a9f19691cea1712fd2849d9cc78 (patch)
tree5b71475c27d61264f5df4763b391bdc088e3f5e8
parent10c8c2177795d069314a8023cd3a570222b2e9da (diff)
Override tethering module APK-in-APEX for Go variant
Bug: 155604224 Test: build Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b Merged-In: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
-rw-r--r--packages/Tethering/Android.bp1
-rw-r--r--packages/Tethering/apex/Android.bp9
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp
index 27297c44573c..93b24f235404 100644
--- a/packages/Tethering/Android.bp
+++ b/packages/Tethering/Android.bp
@@ -108,6 +108,7 @@ android_app {
manifest: "AndroidManifest_InProcess.xml",
// InProcessTethering is a replacement for Tethering
overrides: ["Tethering"],
+ apex_available: ["com.android.tethering"],
}
// Updatable tethering packaged as an application
diff --git a/packages/Tethering/apex/Android.bp b/packages/Tethering/apex/Android.bp
index 24df5f696077..20ccd2ad6453 100644
--- a/packages/Tethering/apex/Android.bp
+++ b/packages/Tethering/apex/Android.bp
@@ -36,3 +36,12 @@ android_app_certificate {
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",
+ ],
+}