commit f48a4ac994a4b613007087d0f6d9e099e630a918
author Iliyan Malchev <malchev@google.com> Thu May 02 02:42:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 02 02:42:15 2013 +0000
tree d857307aa6006e103ed93ee301bd66731205a4f2
parent a8ab97752013af97f53780e1017ee38cfe7a5de0
parent c6b54b7d0b3b477acaa9f4e57241be77d234a8d5

Merge "Camera: Correct the Heap ID used for preview buffer allocation" into jb-mr2-dev

camera/Android.mk

diff --git a/camera/Android.mk b/camera/Android.mk
index 3ce0d1a..d34c60c 100755
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -33,8 +33,8 @@
       LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_CP_MM_HEAP_ID # 8660=SMI, Rest=EBI
       LOCAL_CFLAGS += -DCAMERA_ZSL_ION_HEAP_ID=ION_CP_MM_HEAP_ID
       ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
-        LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_MM_HEAP
-        LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP
+        LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP
+        LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP
         LOCAL_CFLAGS += -DCAMERA_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID
         LOCAL_CFLAGS += -DCAMERA_ZSL_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID
         LOCAL_CFLAGS += -DCAMERA_GRALLOC_CACHING_ID=0