From 0f24916293cb6dcb88b67f75fa79908cb20aba57 Mon Sep 17 00:00:00 2001
From: Andrew Sutherland <dr3wsuth3rland@gmail.com>
Date: Tue, 24 Jul 2012 12:21:50 -0500
Subject: [PATCH] display: fixup ion ifdef again

switch back to TARGET_USES_ION (to be more inline with cm and a frameworks
change forces it to be defined anyway)

Change-Id: Ibc90a8ab0f7ff3477e149ee69489686f94476fec
---
 common.mk             | 5 ++++-
 libgralloc/Android.mk | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common.mk b/common.mk
index 0bc64a3..287da3e 100644
--- a/common.mk
+++ b/common.mk
@@ -15,7 +15,10 @@ endif
 common_libs := liblog libutils libcutils libhardware
 
 #Common C flags
-common_flags := -DUSE_ION -DDEBUG_CALC_FPS -Wno-missing-field-initializers
+common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
+ifeq ($(TARGET_USES_ION),true)
+common_flags += -DUSE_ION
+endif
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
     common_flags += -D__ARM_HAVE_NEON
 endif
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index 016fcbc..d87af79 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -36,12 +36,11 @@ LOCAL_C_INCLUDES       := $(common_includes)
 LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock
 LOCAL_CFLAGS           := $(common_flags) -DLOG_TAG=\"memalloc\"
 LOCAL_SRC_FILES        := alloc_controller.cpp
-ifeq ($(TARGET_USES_PMEM),true)
+ifeq ($(TARGET_USES_ION),true)
+    LOCAL_SRC_FILES +=  ionalloc.cpp
+else
     LOCAL_SRC_FILES +=  pmemalloc.cpp \
                         ashmemalloc.cpp \
                         pmem_bestfit_alloc.cpp
-else
-    LOCAL_CFLAGS += -DUSE_ION
-    LOCAL_SRC_FILES +=  ionalloc.cpp
 endif
 include $(BUILD_SHARED_LIBRARY)