diff options
| -rw-r--r-- | services/vr/hardware_composer/Android.bp | 36 | ||||
| -rw-r--r-- | services/vr/hardware_composer/manifest_vr_hwc.xml | 11 | ||||
| -rw-r--r-- | services/vr/hardware_composer/vr_hardware_composer_service.cpp | 55 | ||||
| -rw-r--r-- | services/vr/hardware_composer/vr_hwc.rc | 6 |
4 files changed, 0 insertions, 108 deletions
diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp index eb24a22719..80e9a3c3b1 100644 --- a/services/vr/hardware_composer/Android.bp +++ b/services/vr/hardware_composer/Android.bp @@ -106,42 +106,6 @@ cc_library_static { ], } -cc_binary { - name: "vr_hwc", - enabled: false, - system_ext_specific: true, - vintf_fragments: ["manifest_vr_hwc.xml"], - srcs: [ - "vr_hardware_composer_service.cpp", - ], - static_libs: [ - "libvr_hwc-impl", - // NOTE: This needs to be included after the *-impl lib otherwise the - // symbols in the *-binder library get optimized out. - "libvr_hwc-binder", - ], - shared_libs: [ - "android.frameworks.vr.composer@2.0", - "android.hardware.graphics.composer@2.3", - "libbase", - "libbinder", - "liblog", - "libhardware", - "libhidlbase", - "libui", - "libutils", - "libvr_hwc-hal", - ], - cflags: [ - "-DLOG_TAG=\"vr_hwc\"", - "-Wall", - "-Werror", - ], - init_rc: [ - "vr_hwc.rc", - ], -} - cc_test { name: "vr_hwc_test", gtest: true, diff --git a/services/vr/hardware_composer/manifest_vr_hwc.xml b/services/vr/hardware_composer/manifest_vr_hwc.xml deleted file mode 100644 index 1068cac33a..0000000000 --- a/services/vr/hardware_composer/manifest_vr_hwc.xml +++ /dev/null @@ -1,11 +0,0 @@ -<manifest version="1.0" type="framework"> - <hal> - <name>android.hardware.graphics.composer</name> - <transport>hwbinder</transport> - <version>2.1</version> - <interface> - <name>IComposer</name> - <instance>vr</instance> - </interface> - </hal> -</manifest> diff --git a/services/vr/hardware_composer/vr_hardware_composer_service.cpp b/services/vr/hardware_composer/vr_hardware_composer_service.cpp deleted file mode 100644 index 7701847120..0000000000 --- a/services/vr/hardware_composer/vr_hardware_composer_service.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2017 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. - */ -#include <binder/ProcessState.h> -#include <binder/IServiceManager.h> -#include <hwbinder/IPCThreadState.h> -#include <impl/vr_hwc.h> -#include <inttypes.h> - -#include "vr_composer.h" - -int main() { - android::ProcessState::self()->startThreadPool(); - - // Register the hwbinder HWC HAL service used by SurfaceFlinger while in VR - // mode. - android::sp<android::dvr::VrHwc> service = new android::dvr::VrHwc(); - - LOG_ALWAYS_FATAL_IF(!service.get(), "Failed to get service"); - LOG_ALWAYS_FATAL_IF(service->isRemote(), "Service is remote"); - - const char instance[] = "vr"; - LOG_ALWAYS_FATAL_IF(service->registerAsService(instance) != android::OK, - "Failed to register service"); - - android::sp<android::dvr::VrComposer> composer = - new android::dvr::VrComposer(service.get()); - - android::sp<android::IServiceManager> sm(android::defaultServiceManager()); - - // Register the binder service used by VR Window Manager service to receive - // frame information from VR HWC HAL. - android::status_t status = sm->addService( - android::dvr::VrComposer::SERVICE_NAME(), composer.get(), - false /* allowIsolated */); - LOG_ALWAYS_FATAL_IF(status != android::OK, - "VrDisplay service failed to start: %" PRId32, status); - - android::hardware::ProcessState::self()->startThreadPool(); - android::hardware::IPCThreadState::self()->joinThreadPool(); - - return 0; -} diff --git a/services/vr/hardware_composer/vr_hwc.rc b/services/vr/hardware_composer/vr_hwc.rc deleted file mode 100644 index 645ab807da..0000000000 --- a/services/vr/hardware_composer/vr_hwc.rc +++ /dev/null @@ -1,6 +0,0 @@ -service vr_hwc /system/bin/vr_hwc - class hal animation - user system - group system graphics - onrestart restart surfaceflinger - writepid /dev/cpuset/system-background/tasks |