Merge "Mark some libs as double_loadable" into pi-dev-plus-aosp (c73c907d) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/gui/Android.bp

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -140,10 +140,26 @@ cc_library_shared {
	"android.hardware.configstore-utils",		"android.hardware.configstore-utils",
	],		],

			// bufferhub is not used when building libgui for vendors
			target: {
			vendor: {
			cflags: ["-DNO_BUFFERHUB"],
			exclude_srcs: [
			"BufferHubConsumer.cpp",
			"BufferHubProducer.cpp",
			],
			exclude_shared_libs: [
			"libbufferhubqueue",
			"libpdx_default_transport",
			],
			},
			},

	header_libs: [		header_libs: [
	"libdvr_headers",		"libdvr_headers",
	"libnativebase_headers",		"libnativebase_headers",
	"libgui_headers",		"libgui_headers",
			"libpdx_headers",
	],		],

	export_shared_lib_headers: [		export_shared_lib_headers: [

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,11 @@
	#define ATRACE_TAG ATRACE_TAG_GRAPHICS		#define ATRACE_TAG ATRACE_TAG_GRAPHICS
	//#define LOG_NDEBUG 0		//#define LOG_NDEBUG 0

			#ifndef NO_BUFFERHUB
	#include <gui/BufferHubConsumer.h>		#include <gui/BufferHubConsumer.h>
	#include <gui/BufferHubProducer.h>		#include <gui/BufferHubProducer.h>
			#endif

	#include <gui/BufferQueue.h>		#include <gui/BufferQueue.h>
	#include <gui/BufferQueueConsumer.h>		#include <gui/BufferQueueConsumer.h>
	#include <gui/BufferQueueCore.h>		#include <gui/BufferQueueCore.h>
	@@ -103,6 +106,7 @@ void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,
	*outConsumer = consumer;		*outConsumer = consumer;
	}		}

			#ifndef NO_BUFFERHUB
	void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,		void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,
	sp<IGraphicBufferConsumer>* outConsumer) {		sp<IGraphicBufferConsumer>* outConsumer) {
	LOG_ALWAYS_FATAL_IF(outProducer == NULL, "BufferQueue: outProducer must not be NULL");		LOG_ALWAYS_FATAL_IF(outProducer == NULL, "BufferQueue: outProducer must not be NULL");
	@@ -128,5 +132,6 @@ void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,
	*outProducer = producer;		*outProducer = producer;
	*outConsumer = consumer;		*outConsumer = consumer;
	}		}
			#endif

	}; // namespace android		}; // namespace android

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,9 @@
	#include <binder/Parcel.h>		#include <binder/Parcel.h>
	#include <binder/IInterface.h>		#include <binder/IInterface.h>

			#ifndef NO_BUFFERHUB
	#include <gui/BufferHubProducer.h>		#include <gui/BufferHubProducer.h>
			#endif
	#include <gui/BufferQueueDefs.h>		#include <gui/BufferQueueDefs.h>
	#include <gui/IGraphicBufferProducer.h>		#include <gui/IGraphicBufferProducer.h>
	#include <gui/IProducerListener.h>		#include <gui/IProducerListener.h>
	@@ -706,6 +708,7 @@ sp<IGraphicBufferProducer> IGraphicBufferProducer::createFromParcel(const Parcel
	}		}
	case USE_BUFFER_HUB: {		case USE_BUFFER_HUB: {
	ALOGE("createFromParcel: BufferHub not implemented.");		ALOGE("createFromParcel: BufferHub not implemented.");
			#ifndef NO_BUFFERHUB
	dvr::ProducerQueueParcelable producerParcelable;		dvr::ProducerQueueParcelable producerParcelable;
	res = producerParcelable.readFromParcel(parcel);		res = producerParcelable.readFromParcel(parcel);
	if (res != NO_ERROR) {		if (res != NO_ERROR) {
	@@ -713,6 +716,9 @@ sp<IGraphicBufferProducer> IGraphicBufferProducer::createFromParcel(const Parcel
	return nullptr;		return nullptr;
	}		}
	return BufferHubProducer::Create(std::move(producerParcelable));		return BufferHubProducer::Create(std::move(producerParcelable));
			#else
			return nullptr;
			#endif
	}		}
	default: {		default: {
	ALOGE("createFromParcel: Unexpected mgaic: 0x%x.", outMagic);		ALOGE("createFromParcel: Unexpected mgaic: 0x%x.", outMagic);

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -79,9 +79,11 @@ public:
	sp<IGraphicBufferConsumer>* outConsumer,		sp<IGraphicBufferConsumer>* outConsumer,
	bool consumerIsSurfaceFlinger = false);		bool consumerIsSurfaceFlinger = false);

			#ifndef NO_BUFFERHUB
	// Creates an IGraphicBufferProducer and IGraphicBufferConsumer pair backed by BufferHub.		// Creates an IGraphicBufferProducer and IGraphicBufferConsumer pair backed by BufferHub.
	static void createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,		static void createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,
	sp<IGraphicBufferConsumer>* outConsumer);		sp<IGraphicBufferConsumer>* outConsumer);
			#endif

	BufferQueue() = delete; // Create through createBufferQueue		BufferQueue() = delete; // Create through createBufferQueue
	};		};

+1 −1