Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844e3790 authored Jan 22, 2018 by Courtney Goeltzenleuchter Committed by Android (Google) Code Review Jan 22, 2018

Merge "Update hwcomposer include paths"

parents 380a5388 87551225

libs/vr/libvrflinger/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@ includeFiles = [ "include" ]

	staticLibraries = [		staticLibraries = [
	"libsurfaceflingerincludes",		"libsurfaceflingerincludes",
	"libhwcomposer-command-buffer",
	"libbufferhub",		"libbufferhub",
	"libbufferhubqueue",		"libbufferhubqueue",
	"libdisplay",		"libdisplay",
	@@ -64,7 +63,8 @@ sharedLibraries = [
	]		]

	headerLibraries = [		headerLibraries = [
	"libdvr_headers"		"libdvr_headers",
			"android.hardware.graphics.composer@2.1-command-buffer",
	]		]

	cc_library_static {		cc_library_static {

services/surfaceflinger/Android.mk

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,13 +59,15 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
	LOCAL_CFLAGS += -fvisibility=hidden -Werror=format		LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

	LOCAL_STATIC_LIBRARIES := \		LOCAL_STATIC_LIBRARIES := \
	libhwcomposer-command-buffer \
	libtrace_proto \		libtrace_proto \
	libvkjson \		libvkjson \
	libvr_manager \		libvr_manager \
	libvrflinger \		libvrflinger \
	libserviceutils		libserviceutils

			LOCAL_HEADER_LIBRARIES := \
			android.hardware.graphics.composer@2.1-command-buffer

	LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libserviceutils		LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libserviceutils

	LOCAL_SHARED_LIBRARIES := \		LOCAL_SHARED_LIBRARIES := \

services/surfaceflinger/DisplayHardware/ComposerHal.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,8 @@

	#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>		#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>
	#include <android/hardware/graphics/composer/2.1/IComposer.h>		#include <android/hardware/graphics/composer/2.1/IComposer.h>
			#include <composer-command-buffer/2.1/ComposerCommandBuffer.h>
	#include <utils/StrongPointer.h>		#include <utils/StrongPointer.h>
	#include <IComposerCommandBuffer.h>

	namespace android {		namespace android {

services/surfaceflinger/tests/fakehwc/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,9 @@ cc_test {
	"libtrace_proto",		"libtrace_proto",
	"libgmock"		"libgmock"
	],		],
			header_libs: [
			"android.hardware.graphics.composer@2.1-command-buffer",
			],
	cppflags: [		cppflags: [
	"-std=c++1z",		"-std=c++1z",
	],		],

services/vr/hardware_composer/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,10 @@ cc_library_shared {
	"libutils",		"libutils",
	],		],

			header_libs: [
			"android.hardware.graphics.composer@2.1-command-buffer",
			],

	export_static_lib_headers: [		export_static_lib_headers: [
	"libhwcomposer-client",		"libhwcomposer-client",
	],		],