native: use standard cm qcom ifdef (5e76750f) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/gui/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ endif
		ifeq ($(BOARD_USES_QCOM_HARDWARE), true)
		LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
		LOCAL_C_INCLUDES += hardware/qcom/display/libqdutils
		LOCAL_CFLAGS += -DQCOMHW
		LOCAL_CFLAGS += -DQCOM_HARDWARE
		endif

		include $(BUILD_SHARED_LIBRARY)

libs/gui/SurfaceTexture.cpp

+2 −2

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

		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		#include <gpuformats.h>
		#endif

		@@ -256,7 +256,7 @@ status_t SurfaceTexture::updateTexImage(BufferRejecter* rejecter) {
		ST_LOGE("updateTexImage: buffer at slot %d is null", buf);
		err = BAD_VALUE;
		} else {
		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		gpuSupportedFormat = qdutils::isGPUSupportedFormat(
		mEGLSlots[buf].mGraphicBuffer->format);
		#endif

libs/gui/SurfaceTextureClient.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		#include <gui/SurfaceTextureClient.h>

		#include <private/gui/ComposerService.h>
		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		#include <gralloc_priv.h>
		#endif

		@@ -506,7 +506,7 @@ int SurfaceTextureClient::setUsage(uint32_t reqUsage)
		ALOGV("SurfaceTextureClient::setUsage");
		Mutex::Autolock lock(mMutex);

		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		if (reqUsage & GRALLOC_USAGE_PRIVATE_EXTERNAL_ONLY) {
		//Set explicitly, since reqUsage may have other values.
		mReqExtUsage = GRALLOC_USAGE_PRIVATE_EXTERNAL_ONLY;
		@@ -768,12 +768,12 @@ status_t SurfaceTextureClient::lock(
		backBuffer->height == frontBuffer->height &&
		backBuffer->format == frontBuffer->format);

		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		int backBufferSlot(getSlotFromBufferLocked(backBuffer.get()));
		#endif
		if (canCopyBack) {
		// copy the area that is invalid and not repainted this round
		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		Mutex::Autolock lock(mMutex);
		Region oldDirtyRegion;
		for(int i = 0 ; i < NUM_BUFFER_SLOTS; i++ ) {
		@@ -790,7 +790,7 @@ status_t SurfaceTextureClient::lock(
		// if we can't copy-back anything, modify the user's dirty
		// region to make sure they redraw the whole buffer
		newDirtyRegion.set(bounds);
		#ifndef QCOMHW
		#ifndef QCOM_HARDWARE
		mDirtyRegion.clear();
		#endif
		Mutex::Autolock lock(mMutex);
		@@ -802,7 +802,7 @@ status_t SurfaceTextureClient::lock(

		{ // scope for the lock
		Mutex::Autolock lock(mMutex);
		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		mSlots[backBufferSlot].dirtyRegion = newDirtyRegion;
		#else
		int backBufferSlot(getSlotFromBufferLocked(backBuffer.get()));
		@@ -814,7 +814,7 @@ status_t SurfaceTextureClient::lock(
		#endif
		}

		#ifndef QCOMHW
		#ifndef QCOM_HARDWARE
		mDirtyRegion.orSelf(newDirtyRegion);
		#endif

libs/ui/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ LOCAL_CFLAGS += -DSAMSUNG_EXYNOS5250
		endif

		ifeq ($(BOARD_USES_QCOM_HARDWARE), true)
		LOCAL_CFLAGS += -DQCOMHW
		LOCAL_CFLAGS += -DQCOM_HARDWARE
		endif

		LOCAL_MODULE:= libui

libs/ui/FramebufferNativeWindow.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window,
		ANativeWindowBuffer* buffer)
		{
		FramebufferNativeWindow* self = getSelf(window);
		#ifndef QCOMHW
		#ifndef QCOM_HARDWARE
		Mutex::Autolock _l(self->mutex);
		#endif
		framebuffer_device_t* fb = self->fbDev;
		@@ -272,7 +272,7 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window,

		const int index = self->mCurrentBufferIndex;
		int res = fb->post(fb, handle);
		#ifdef QCOMHW
		#ifdef QCOM_HARDWARE
		Mutex::Autolock _l(self->mutex);
		#endif
		self->front = static_cast<NativeBuffer*>(buffer);
		@@ -306,7 +306,7 @@ int FramebufferNativeWindow::query(const ANativeWindow* window,
		int what, int* value)
		{
		const FramebufferNativeWindow* self = getSelf(window);
		#ifndef QCOMHW
		#ifndef QCOM_HARDWARE
		Mutex::Autolock _l(self->mutex);
		#endif
		framebuffer_device_t* fb = self->fbDev;