From 0fefc379092d0a26326dce3f228788762351ce1a Mon Sep 17 00:00:00 2001
From: Andrew Sutherland <dr3wsuth3rland@gmail.com>
Date: Tue, 22 May 2012 17:06:11 -0500
Subject: [PATCH] Makefiles: remove QCOM_HARDWARE cflag

Change-Id: Ief3ab8c3eb89fa54fdf3f7889c962311615d7542
---
 libgralloc/Android.mk      | 3 +--
 libhwcomposer/Android.mk   | 1 -
 libtilerenderer/Android.mk | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index 82c92ee..e893259 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -33,7 +33,6 @@ LOCAL_SRC_FILES :=  framebuffer.cpp \
 LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).gralloc\" -DHOST -DDEBUG_CALC_FPS
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 
 ifeq ($(call is-board-platform,msm7x27),true)
     LOCAL_CFLAGS += -DTARGET_MSM7x27
@@ -63,7 +62,7 @@ include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
-LOCAL_SRC_FILES +=  ashmemalloc.cpp \
+LOCAL_SRC_FILES :=  ashmemalloc.cpp \
                     pmemalloc.cpp \
                     pmem_bestfit_alloc.cpp \
                     alloc_controller.cpp
diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index c0afc43..e20a853 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -14,7 +14,6 @@ LOCAL_SRC_FILES := 	\
 
 LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
 LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).hwcomposer\" -DDEBUG_CALC_FPS
-LOCAL_CFLAGS += -DQCOM_HARDWARE
 
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
diff --git a/libtilerenderer/Android.mk b/libtilerenderer/Android.mk
index 588b684..67316bf 100644
--- a/libtilerenderer/Android.mk
+++ b/libtilerenderer/Android.mk
@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_SRC_FILES := 	\
 	tilerenderer.cpp
 
-LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DQCOM_HARDWARE
+LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER
 LOCAL_MODULE := libtilerenderer
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)