Merge "Update hwcomposer include paths" (b6265411) · Commits · e / os / android_hardware_interfaces

graphics/composer/2.1/default/Android.bp

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,9 @@ cc_library_static {
	"libsync",		"libsync",
	"libutils",		"libutils",
	],		],
			header_libs: [
			"android.hardware.graphics.composer@2.1-command-buffer",
			],
	}		}

	cc_library_shared {		cc_library_shared {
	@@ -41,6 +44,9 @@ cc_library_shared {
	"libhwc2on1adapter",		"libhwc2on1adapter",
	"libhwc2onfbadapter",		"libhwc2onfbadapter",
	],		],
			header_libs: [
			"android.hardware.graphics.composer@2.1-command-buffer",
			],
	}		}

	cc_binary {		cc_binary {
	@@ -65,10 +71,3 @@ cc_binary {
	"libutils",		"libutils",
	],		],
	}		}

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,9 +19,8 @@
	#include <android/hardware/graphics/mapper/2.0/IMapper.h>		#include <android/hardware/graphics/mapper/2.0/IMapper.h>
	#include <log/log.h>		#include <log/log.h>

	#include "ComposerClient.h"
	#include "ComposerBase.h"		#include "ComposerBase.h"
	#include "IComposerCommandBuffer.h"		#include "ComposerClient.h"

	namespace android {		namespace android {
	namespace hardware {		namespace hardware {

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,8 @@
	#include <unordered_map>		#include <unordered_map>
	#include <vector>		#include <vector>

			#include <composer-command-buffer/2.1/ComposerCommandBuffer.h>
	#include <hardware/hwcomposer2.h>		#include <hardware/hwcomposer2.h>
	#include "IComposerCommandBuffer.h"
	#include "ComposerBase.h"		#include "ComposerBase.h"

	namespace android {		namespace android {

+1 −0

0 → 100644

+4 −0