commit b5f465a4e3be28293c99112d3cdc1b519bf8ac86
author Victor Hsieh <victorhsieh@google.com> Tue May 11 13:45:15 2021 -0700
committer Victor Hsieh <victorhsieh@google.com> Thu May 13 12:41:17 2021 -0700
tree 50597abf5723497d3741e5beeab1dc31e5aee2fc
parent 3f7d7911901522e047724a54a7f0c66b8cd75fab

Add compsvc, compsvc_worker and pvm_exec to compos apex

Bug: 186126404
Test: mma

Change-Id: Ifd3bbc5597c96b84262c7548f278d04ec80af1a6

compos/Android.bp

diff --git a/compos/Android.bp b/compos/Android.bp
index ac69a52..e0da192 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -11,6 +11,9 @@
         "libnix",
         "libscopeguard",
     ],
+    apex_available: [
+        "com.android.compos",
+    ],
 }
 
 rust_binary {
@@ -24,6 +27,9 @@
         "liblog_rust",
         "libminijail_rust",
     ],
+    apex_available: [
+        "com.android.compos",
+    ],
 }
 
 rust_binary {
@@ -38,4 +44,7 @@
         "libnix",
         "libscopeguard",
     ],
+    apex_available: [
+        "com.android.compos",
+    ],
 }

compos/aidl/Android.bp

diff --git a/compos/aidl/Android.bp b/compos/aidl/Android.bp
index 8737d63..918d4c8 100644
--- a/compos/aidl/Android.bp
+++ b/compos/aidl/Android.bp
@@ -7,6 +7,9 @@
     backend: {
         rust: {
             enabled: true,
+            apex_available: [
+                "com.android.compos",
+            ],
         },
     },
 }

compos/apex/Android.bp

diff --git a/compos/apex/Android.bp b/compos/apex/Android.bp
index ed4dd58..081d12b 100644
--- a/compos/apex/Android.bp
+++ b/compos/apex/Android.bp
@@ -30,4 +30,10 @@
 
     // TODO(victorhsieh): make it updatable
     updatable: false,
+
+    binaries: [
+        "compsvc",
+        "compsvc_worker",
+        "pvm_exec",
+    ],
 }

compos/src/compsvc.rs

diff --git a/compos/src/compsvc.rs b/compos/src/compsvc.rs
index e912463..ddfcea0 100644
--- a/compos/src/compsvc.rs
+++ b/compos/src/compsvc.rs
@@ -43,8 +43,7 @@
 };
 
 const SERVICE_NAME: &str = "compsvc";
-// TODO(b/161470604): Move the executable into an apex.
-const WORKER_BIN: &str = "/system/bin/compsvc_worker";
+const WORKER_BIN: &str = "/apex/com.android.compos/bin/compsvc_worker";
 // TODO: Replace with a valid directory setup in the VM.
 const AUTHFS_MOUNTPOINT: &str = "/data/local/tmp/authfs_mnt";