Remove legacy method from ICompOsService
Bug: 210998077
Test: m
Change-Id: Iad1c9cbacdcdb1c1de82765fdc0c6eb9ec2dee3f
diff --git a/compos/aidl/com/android/compos/FdAnnotation.aidl b/compos/aidl/com/android/compos/FdAnnotation.aidl
deleted file mode 100644
index b910391..0000000
--- a/compos/aidl/com/android/compos/FdAnnotation.aidl
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.compos;
-
-/** {@hide} */
-parcelable FdAnnotation {
- /**
- * Input file descriptor numbers to be passed to the program. This is currently assumed to be
- * same as the file descriptor number used in the backend server.
- */
- int[] input_fds;
-
- /**
- * Output file descriptor numbers to be passed to the program. This is currently assumed to be
- * same as the file descriptor number used in the backend server.
- */
- int[] output_fds;
-}
diff --git a/compos/aidl/com/android/compos/ICompOsService.aidl b/compos/aidl/com/android/compos/ICompOsService.aidl
index b2b961a..39e9d61 100644
--- a/compos/aidl/com/android/compos/ICompOsService.aidl
+++ b/compos/aidl/com/android/compos/ICompOsService.aidl
@@ -17,7 +17,6 @@
package com.android.compos;
import com.android.compos.CompOsKeyData;
-import com.android.compos.FdAnnotation;
/** {@hide} */
interface ICompOsService {
@@ -51,21 +50,6 @@
String zygoteArch, String systemServerCompilerFilter);
/**
- * Runs dexopt compilation encoded in the marshaled dexopt arguments.
- *
- * To keep ART indepdendantly updatable, the compilation arguments are not stabilized. As a
- * result, the arguments are marshaled into byte array. Upon received, the service asks ART to
- * return relevant information (since ART is able to unmarshal its own encoding), in order to
- * set up the execution context (mainly file descriptors for compiler input and output) then
- * invokes the compiler.
- *
- * @param marshaledArguments The marshaled dexopt arguments.
- * @param fd_annotation Additional file descriptor information of the execution.
- * @return exit code
- */
- byte compile(in byte[] marshaledArguments, in FdAnnotation fd_annotation);
-
- /**
* Generate a new public/private key pair suitable for signing CompOs output files.
*
* @return a certificate for the public key and the encrypted private key
diff --git a/compos/src/compsvc.rs b/compos/src/compsvc.rs
index 356cc7e..b4af9b5 100644
--- a/compos/src/compsvc.rs
+++ b/compos/src/compsvc.rs
@@ -32,7 +32,6 @@
use authfs_aidl_interface::aidl::com::android::virt::fs::IAuthFsService::IAuthFsService;
use compos_aidl_interface::aidl::com::android::compos::{
CompOsKeyData::CompOsKeyData,
- FdAnnotation::FdAnnotation,
ICompOsService::{BnCompOsService, ICompOsService},
};
use compos_aidl_interface::binder::{
@@ -113,10 +112,6 @@
Ok(exit_code as i8)
}
- fn compile(&self, _marshaled: &[u8], _fd_annotation: &FdAnnotation) -> BinderResult<i8> {
- Err(new_binder_exception(ExceptionCode::UNSUPPORTED_OPERATION, "Not yet implemented"))
- }
-
fn generateSigningKey(&self) -> BinderResult<CompOsKeyData> {
to_binder_result(self.key_service.generate())
}