Merge "Move VR HWC HAL impl to vr/hardware_composer and cleanup deps" into oc-dev (73fe6115) · Commits · e / os / android_frameworks_native

services/vr/hardware_composer/Android.bp

+53 −4

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libvr_hwc-hal",

		srcs: [
		"impl/vr_hwc.cpp",
		"impl/vr_composer_client.cpp",
		],

		static_libs: [
		"libhwcomposer-client",
		"libdisplay",
		"libbufferhubqueue",
		"libbufferhub",
		"libpdx_default_transport",
		],

		shared_libs: [
		"android.frameworks.vr.composer@1.0",
		"android.hardware.graphics.composer@2.1",
		"libbase",
		"libcutils",
		"libfmq",
		"libhardware",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libsync",
		"libui",
		"libutils",
		],

		export_static_lib_headers: [
		"libhwcomposer-client",
		],

		export_shared_lib_headers: [
		"android.frameworks.vr.composer@1.0",
		"android.hardware.graphics.composer@2.1",
		],

		export_include_dirs: ["."],

		cflags: [
		"-DLOG_TAG=\"vr_hwc\"",
		],

		}

		cc_library_static {
		name: "libvr_hwc-binder",
		srcs: [
		@@ -12,11 +60,12 @@ cc_library_static {
		export_aidl_headers: true,
		},
		export_include_dirs: ["aidl"],

		shared_libs: [
		"libbinder",
		"libui",
		"libutils",
		"libvrhwc",
		"libvr_hwc-hal",
		],
		}

		@@ -34,10 +83,10 @@ cc_library_static {
		"liblog",
		"libui",
		"libutils",
		"libvrhwc",
		"libvr_hwc-hal",
		],
		export_shared_lib_headers: [
		"libvrhwc",
		"libvr_hwc-hal",
		],
		cflags: [
		"-DLOG_TAG=\"vr_hwc\"",
		@@ -65,7 +114,7 @@ cc_binary {
		"libhwbinder",
		"libui",
		"libutils",
		"libvrhwc",
		"libvr_hwc-hal",
		],
		cflags: [
		"-DLOG_TAG=\"vr_hwc\"",

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@
		#include <hardware/gralloc1.h>
		#include <log/log.h>

		#include "vr_hwc.h"
		#include "vr_composer_client.h"
		#include "impl/vr_hwc.h"
		#include "impl/vr_composer_client.h"

		namespace android {
		namespace dvr {

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		* limitations under the License.
		*/

		#ifndef VR_WINDOW_MANAGER_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H_
		#define VR_WINDOW_MANAGER_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H_
		#ifndef ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H
		#define ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H

		#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>
		#include <ComposerClient.h>
		@@ -68,4 +68,4 @@ class VrComposerClient : public ComposerClient {
		} // namespace dvr
		} // namespace android

		#endif // VR_WINDOW_MANAGER_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H_
		#endif // ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H

+2 −3

Original line number	Diff line number	Diff line
		@@ -13,14 +13,13 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#include "vr_hwc.h"
		#include "impl/vr_hwc.h"

		#include <private/dvr/display_client.h>
		#include <ui/Fence.h>

		#include <mutex>

		#include <private/dvr/display_client.h>

		#include "vr_composer_client.h"

		using namespace android::hardware::graphics::common::V1_0;

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,8 +13,8 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#ifndef VR_WINDOW_MANAGER_COMPOSER_IMPL_VR_HWC_H_
		#define VR_WINDOW_MANAGER_COMPOSER_IMPL_VR_HWC_H_
		#ifndef ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_HWC_H
		#define ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_HWC_H

		#include <android-base/unique_fd.h>
		#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>
		@@ -319,4 +319,4 @@ hardware::graphics::composer::V2_1::IComposer* HIDL_FETCH_IComposer(
		} // namespace dvr
		} // namespace android

		#endif // VR_WINDOW_MANAGER_COMPOSER_IMPL_VR_HWC_H_
		#endif // ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_HWC_H