android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

display: fixup ion ifdef again

Browse Source 
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
This commit is contained in:
Andrew Sutherland 2012-07-24 12:21:50 -05:00
parent a91c998940
commit 0f24916293
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common.mk
View File

@ -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

7
libgralloc/Android.mk
View File

@ -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)