diff options
| -rw-r--r-- | libs/vr/libvrflinger/Android.bp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.mk | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/ComposerHal.cpp | 4 | ||||
| -rw-r--r-- | services/vr/hardware_composer/Android.bp | 2 | ||||
| -rw-r--r-- | services/vr/vr_window_manager/Android.bp | 2 | ||||
| -rw-r--r-- | services/vr/vr_window_manager/composer/1.0/Android.bp | 54 | ||||
| -rw-r--r-- | services/vr/vr_window_manager/composer/1.0/IVrComposerClient.hal | 49 | ||||
| -rw-r--r-- | services/vr/vr_window_manager/composer/Android.bp | 6 | ||||
| -rw-r--r-- | services/vr/vr_window_manager/composer/impl/vr_composer_client.cpp | 4 |
9 files changed, 8 insertions, 116 deletions
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp index 3f79a7bf17..0daab642b3 100644 --- a/libs/vr/libvrflinger/Android.bp +++ b/libs/vr/libvrflinger/Android.bp @@ -47,7 +47,6 @@ staticLibraries = [ ] sharedLibraries = [ - "android.dvr.composer@1.0", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.composer@2.1", "libbinder", diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index ebf72bcc87..76baa01f84 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -74,7 +74,7 @@ LOCAL_STATIC_LIBRARIES := \ libvrflinger LOCAL_SHARED_LIBRARIES := \ - android.dvr.composer@1.0 \ + android.frameworks.vr.composer@1.0 \ android.hardware.graphics.allocator@2.0 \ android.hardware.graphics.composer@2.1 \ android.hardware.configstore@1.0 \ diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp index d9bddb5af2..33aa7598ee 100644 --- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp +++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp @@ -17,7 +17,7 @@ #undef LOG_TAG #define LOG_TAG "HwcComposer" -#include <android/dvr/composer/1.0/IVrComposerClient.h> +#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h> #include <inttypes.h> #include <log/log.h> #include <gui/BufferQueue.h> @@ -26,7 +26,7 @@ namespace android { -using dvr::composer::V1_0::IVrComposerClient; +using frameworks::vr::composer::V1_0::IVrComposerClient; using hardware::Return; using hardware::hidl_vec; using hardware::hidl_handle; diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp index 629d65bb5a..b94d333f1c 100644 --- a/services/vr/hardware_composer/Android.bp +++ b/services/vr/hardware_composer/Android.bp @@ -56,7 +56,7 @@ cc_binary { "libvr_hwc-binder", ], shared_libs: [ - "android.dvr.composer@1.0", + "android.frameworks.vr.composer@1.0", "android.hardware.graphics.composer@2.1", "libbase", "libbinder", diff --git a/services/vr/vr_window_manager/Android.bp b/services/vr/vr_window_manager/Android.bp index 0406331a4d..669426bedd 100644 --- a/services/vr/vr_window_manager/Android.bp +++ b/services/vr/vr_window_manager/Android.bp @@ -47,7 +47,7 @@ static_libs = [ ] shared_libs = [ - "android.dvr.composer@1.0", + "android.frameworks.vr.composer@1.0", "android.hardware.graphics.composer@2.1", "libvrhwc", "libbase", diff --git a/services/vr/vr_window_manager/composer/1.0/Android.bp b/services/vr/vr_window_manager/composer/1.0/Android.bp deleted file mode 100644 index 58f83f8518..0000000000 --- a/services/vr/vr_window_manager/composer/1.0/Android.bp +++ /dev/null @@ -1,54 +0,0 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. - -genrule { - name: "android.dvr.composer@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hardware:hardware/interfaces/ -randroid.dvr:frameworks/native/services/vr/vr_window_manager android.dvr.composer@1.0", - srcs: [ - "IVrComposerClient.hal", - ], - out: [ - "android/dvr/composer/1.0/VrComposerClientAll.cpp", - ], -} - -genrule { - name: "android.dvr.composer@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hardware:hardware/interfaces/ -randroid.dvr:frameworks/native/services/vr/vr_window_manager android.dvr.composer@1.0", - srcs: [ - "IVrComposerClient.hal", - ], - out: [ - "android/dvr/composer/1.0/IVrComposerClient.h", - "android/dvr/composer/1.0/IHwVrComposerClient.h", - "android/dvr/composer/1.0/BnHwVrComposerClient.h", - "android/dvr/composer/1.0/BpHwVrComposerClient.h", - "android/dvr/composer/1.0/BsVrComposerClient.h", - ], -} - -cc_library_shared { - name: "android.dvr.composer@1.0", - generated_sources: ["android.dvr.composer@1.0_genc++"], - generated_headers: ["android.dvr.composer@1.0_genc++_headers"], - export_generated_headers: ["android.dvr.composer@1.0_genc++_headers"], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.composer@2.1", - "android.hidl.base@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.composer@2.1", - "android.hidl.base@1.0", - ], -} diff --git a/services/vr/vr_window_manager/composer/1.0/IVrComposerClient.hal b/services/vr/vr_window_manager/composer/1.0/IVrComposerClient.hal deleted file mode 100644 index 230a68a42b..0000000000 --- a/services/vr/vr_window_manager/composer/1.0/IVrComposerClient.hal +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2016 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 android.dvr.composer@1.0; - -import android.hardware.graphics.composer@2.1::IComposerClient; - -interface IVrComposerClient - extends android.hardware.graphics.composer@2.1::IComposerClient { - /* - * Used to annotate the layer with additional information, which will be - * used to describe the content of the layer (ie: notification, permission, - * etc) which allows VR window manager to treat certain layer types - * specially. - * - * @param display is the display on which the layer was created. - * @param layer is the layer affected by the change. - * @param layer_type the type of the layer as described by the window - * manager. - * @param application_id the application id the layer belongs to. - * @return error is NONE upon success. Otherwise, - * BAD_DISPLAY when an invalid display handle was passed in. - * BAD_LAYER when an invalid layer handle was passed in. - * - * setLayerInfo(Display display, - * Layer layer, - * uint32_t layer_type, - * uint32_t application_id) - * generates(Error error); - */ - - enum VrCommand : int32_t { - OPCODE_SHIFT = android.hardware.graphics.composer@2.1::IComposerClient.Command:OPCODE_SHIFT, - - SET_LAYER_INFO = 0x800 << OPCODE_SHIFT, - }; -}; diff --git a/services/vr/vr_window_manager/composer/Android.bp b/services/vr/vr_window_manager/composer/Android.bp index f28818aad4..007251fe14 100644 --- a/services/vr/vr_window_manager/composer/Android.bp +++ b/services/vr/vr_window_manager/composer/Android.bp @@ -1,7 +1,3 @@ -subdirs = [ - "1.0", -] - cc_library_shared { name: "libvrhwc", @@ -20,7 +16,7 @@ cc_library_shared { ], shared_libs: [ - "android.dvr.composer@1.0", + "android.frameworks.vr.composer@1.0", "android.hardware.graphics.composer@2.1", "libbase", "libcutils", diff --git a/services/vr/vr_window_manager/composer/impl/vr_composer_client.cpp b/services/vr/vr_window_manager/composer/impl/vr_composer_client.cpp index 367acb7cdf..acf0dac734 100644 --- a/services/vr/vr_window_manager/composer/impl/vr_composer_client.cpp +++ b/services/vr/vr_window_manager/composer/impl/vr_composer_client.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <android/dvr/composer/1.0/IVrComposerClient.h> +#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h> #include <hardware/gralloc.h> #include <hardware/gralloc1.h> #include <log/log.h> @@ -26,7 +26,7 @@ namespace android { namespace dvr { using android::hardware::graphics::common::V1_0::PixelFormat; -using android::dvr::composer::V1_0::IVrComposerClient; +using android::frameworks::vr::composer::V1_0::IVrComposerClient; VrComposerClient::VrComposerClient(dvr::VrHwc& hal) : ComposerClient(hal), mVrHal(hal) {} |