Merge "graphics: rework IComposer" (02d69ca8) · Commits · e / os / android_hardware_interfaces

graphics/composer/2.1/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -8,11 +8,13 @@ genrule {
		"types.hal",
		"IComposer.hal",
		"IComposerCallback.hal",
		"IComposerClient.hal",
		],
		out: [
		"android/hardware/graphics/composer/2.1/types.cpp",
		"android/hardware/graphics/composer/2.1/ComposerAll.cpp",
		"android/hardware/graphics/composer/2.1/ComposerCallbackAll.cpp",
		"android/hardware/graphics/composer/2.1/ComposerClientAll.cpp",
		],
		}

		@@ -24,6 +26,7 @@ genrule {
		"types.hal",
		"IComposer.hal",
		"IComposerCallback.hal",
		"IComposerClient.hal",
		],
		out: [
		"android/hardware/graphics/composer/2.1/types.h",
		@@ -37,6 +40,11 @@ genrule {
		"android/hardware/graphics/composer/2.1/BnComposerCallback.h",
		"android/hardware/graphics/composer/2.1/BpComposerCallback.h",
		"android/hardware/graphics/composer/2.1/BsComposerCallback.h",
		"android/hardware/graphics/composer/2.1/IComposerClient.h",
		"android/hardware/graphics/composer/2.1/IHwComposerClient.h",
		"android/hardware/graphics/composer/2.1/BnComposerClient.h",
		"android/hardware/graphics/composer/2.1/BpComposerClient.h",
		"android/hardware/graphics/composer/2.1/BsComposerClient.h",
		],
		}

+7 −1096

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+1118 −0

File added.

Preview size limit exceeded, changes collapsed.

+12 −2

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "android.hardware.graphics.composer@2.1-impl",
		relative_install_path: "hw",
		srcs: ["Hwc.cpp"],
		srcs: ["Hwc.cpp", "HwcClient.cpp"],
		shared_libs: [
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.composer@2.1",
		"libbase",
		"libcutils",
		"libfmq",
		"libhardware",
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libsync",
		"libutils",
		],
		}
		@@ -19,7 +21,7 @@ cc_library_shared {
		cc_binary {
		name: "android.hardware.graphics.composer@2.1-service",
		relative_install_path: "hw",
		srcs: ["service.cpp", "Hwc.cpp"],
		srcs: ["service.cpp", "Hwc.cpp", "HwcClient.cpp"],
		cppflags: ["-DBINDERIZED"],
		init_rc: ["android.hardware.graphics.composer@2.1-service.rc"],

		@@ -29,11 +31,19 @@ cc_binary {
		"libbase",
		"libbinder",
		"libcutils",
		"libfmq",
		"libhardware",
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libsync",
		"libutils",
		],
		}

		cc_library_static {
		name: "libhwcomposer-command-buffer",
		shared_libs: ["android.hardware.graphics.composer@2.1"],
		export_include_dirs: ["."],
		}

+322 −926

File changed.

Preview size limit exceeded, changes collapsed.