Add a system server JAR
Add a Java system server classpath fragment to wrap access to
composd. Provide initially empty SystemService and JobService classes.
Bug: 199147668
Test: manual
Change-Id: I5b2bb2f4c9b9086cca85983d0a659ea92409f6bf
diff --git a/compos/aidl/Android.bp b/compos/aidl/Android.bp
index 4d36d3d..7036511 100644
--- a/compos/aidl/Android.bp
+++ b/compos/aidl/Android.bp
@@ -9,6 +9,11 @@
"com/android/compos/*.aidl",
],
backend: {
+ java: {
+ apex_available: [
+ "com.android.compos",
+ ],
+ },
rust: {
enabled: true,
apex_available: [
diff --git a/compos/apex/Android.bp b/compos/apex/Android.bp
index c68899a..43e75e4 100644
--- a/compos/apex/Android.bp
+++ b/compos/apex/Android.bp
@@ -51,6 +51,8 @@
"compsvc",
],
+ systemserverclasspath_fragments: ["com.android.compos-systemserverclasspath-fragment"],
+
apps: [
"CompOSPayloadApp",
],
@@ -61,6 +63,12 @@
],
}
+systemserverclasspath_fragment {
+ name: "com.android.compos-systemserverclasspath-fragment",
+ contents: ["service-compos"],
+ apex_available: ["com.android.compos"],
+}
+
prebuilt_etc {
name: "com.android.compos.init.rc",
src: "composd.rc",
diff --git a/compos/composd/aidl/Android.bp b/compos/composd/aidl/Android.bp
index 62c1b40..376313b 100644
--- a/compos/composd/aidl/Android.bp
+++ b/compos/composd/aidl/Android.bp
@@ -9,7 +9,7 @@
unstable: true,
backend: {
java: {
- apex_available: ["//apex_available:platform"],
+ apex_available: ["com.android.compos"],
},
rust: {
enabled: true,
diff --git a/compos/service/Android.bp b/compos/service/Android.bp
new file mode 100644
index 0000000..142460e
--- /dev/null
+++ b/compos/service/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_library {
+ name: "service-compos",
+ srcs: [
+ "java/**/*.java",
+ ],
+ defaults: ["framework-system-server-module-defaults"],
+ permitted_packages: [
+ "com.android.server.compos",
+ "com.android.compos",
+ "android.system.composd",
+ ],
+ static_libs: [
+ "android.system.composd-java",
+ ],
+ apex_available: [
+ "com.android.compos",
+ ],
+ // Access to SystemService etc
+ sdk_version: "system_server_current",
+ installable: true,
+}
diff --git a/compos/service/java/com/android/server/compos/IsolatedCompilationJobService.java b/compos/service/java/com/android/server/compos/IsolatedCompilationJobService.java
new file mode 100644
index 0000000..7bea1ab
--- /dev/null
+++ b/compos/service/java/com/android/server/compos/IsolatedCompilationJobService.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.compos;
+
+import android.app.job.JobParameters;
+import android.app.job.JobService;
+import android.util.Log;
+
+/**
+ * A job scheduler service responsible for performing Isolated Compilation when scheduled.
+ *
+ * @hide
+ */
+public class IsolatedCompilationJobService extends JobService {
+ private static final String TAG = IsolatedCompilationJobService.class.getName();
+
+ @Override
+ public boolean onStartJob(JobParameters params) {
+ Log.i(TAG, "starting job");
+
+ // TODO(b/199147668): Implement
+
+ return false; // Finished
+ }
+
+ @Override
+ public boolean onStopJob(JobParameters params) {
+ return false; // Don't reschedule
+ }
+}
diff --git a/compos/service/java/com/android/server/compos/IsolatedCompilationService.java b/compos/service/java/com/android/server/compos/IsolatedCompilationService.java
new file mode 100644
index 0000000..d2e1f2a
--- /dev/null
+++ b/compos/service/java/com/android/server/compos/IsolatedCompilationService.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.compos;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.util.Log;
+
+import com.android.server.SystemService;
+
+/**
+ * A system service responsible for performing Isolated Compilation (compiling boot & system server
+ * classpath JARs in a protected VM) when appropriate.
+ *
+ * @hide
+ */
+public class IsolatedCompilationService extends SystemService {
+ private static final String TAG = IsolatedCompilationService.class.getName();
+
+ public IsolatedCompilationService(@NonNull Context context) {
+ super(context);
+ }
+
+ @Override
+ public void onStart() {
+ Log.i(TAG, "Started");
+
+ // TODO(b/199147668): Implement
+ }
+}