Merge "Migrate 13 methods of ISurfaceComposer to AIDL" (4b567aee) · Commits · e / os / android_frameworks_native

libs/gui/Android.bp

+15 −1

Original line number	Diff line number	Diff line
		@@ -142,16 +142,24 @@ cc_library_static {
		"include",
		],

		include_dirs: [
		"frameworks/native/include",
		],

		export_shared_lib_headers: [
		"libbinder",
		],

		static_libs: [
		"libui-types",
		"libgui_window_info_static",
		],

		aidl: {
		export_aidl_headers: true,
		include_dirs: [
		"frameworks/native/libs/gui",
		],
		},
		}

		@@ -288,10 +296,16 @@ cc_library_static {
		defaults: ["libgui_bufferqueue-defaults"],

		srcs: [
		":libgui_frame_event_aidl",
		":inputconstants_aidl",
		":libgui_bufferqueue_sources",
		":libgui_aidl",
		],

		aidl: {
		include_dirs: [
		"frameworks/native/libs/gui",
		],
		},
		}

		filegroup {

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include <utils/Trace.h>

		#include <private/gui/ComposerService.h>
		#include <private/gui/ComposerServiceAIDL.h>

		#include <chrono>

		@@ -160,7 +161,7 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati
		mBufferItemConsumer->setFrameAvailableListener(this);
		mBufferItemConsumer->setBufferFreedListener(this);

		ComposerService::getComposerService()->getMaxAcquiredBufferCount(&mMaxAcquiredBuffers);
		ComposerServiceAIDL::getComposerService()->getMaxAcquiredBufferCount(&mMaxAcquiredBuffers);
		mBufferItemConsumer->setMaxAcquiredBufferCount(mMaxAcquiredBuffers);
		mCurrentMaxAcquiredBufferCount = mMaxAcquiredBuffers;
		mNumAcquired = 0;