commit 26fb1448576618c6cd0c6c6b0b59cdb53a14cae1
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 14 22:41:33 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 14 22:41:33 2021 +0000
tree f7e76ffafe3bc6044a92ae94ed3a18bb965ffd4f
parent 6ac0cc00129b6c31a7e2d65152e4ef76fd4de111
parent b5f465a4e3be28293c99112d3cdc1b519bf8ac86

Merge "Add compsvc, compsvc_worker and pvm_exec to compos apex"

compos/Android.bp

diff --git a/compos/Android.bp b/compos/Android.bp
index 32c2b8c..f0a3059 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -15,6 +15,9 @@
         "libnix",
         "libscopeguard",
     ],
+    apex_available: [
+        "com.android.compos",
+    ],
 }
 
 rust_binary {
@@ -28,6 +31,9 @@
         "liblog_rust",
         "libminijail_rust",
     ],
+    apex_available: [
+        "com.android.compos",
+    ],
 }
 
 rust_binary {
@@ -42,4 +48,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 a7dac14..3639775 100644
--- a/compos/aidl/Android.bp
+++ b/compos/aidl/Android.bp
@@ -11,6 +11,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 ccdbd9b..7ced384 100644
--- a/compos/apex/Android.bp
+++ b/compos/apex/Android.bp
@@ -34,4 +34,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";