diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index bc4ffcb..c2128ee 100644
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -25,6 +25,7 @@ LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_SRC_FILES := copybit.cpp
 LOCAL_MODULE := copybit.msm7k
 LOCAL_C_INCLUDES += hardware/msm7k/libgralloc
+LOCAL_C_FLAGS := -DCOPYBIT_MSM7K=1
 include $(BUILD_SHARED_LIBRARY)
 endif
 
@@ -36,5 +37,6 @@ LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_SRC_FILES := copybit.cpp
 LOCAL_MODULE := copybit.qsd8k
 LOCAL_C_INCLUDES += hardware/libhardware/modules/gralloc
+LOCAL_C_FLAGS := -DCOPYBIT_QSD8K=1
 include $(BUILD_SHARED_LIBRARY)
 endif
diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp
index 6a4993c..f734b73 100644
--- a/libcopybit/copybit.cpp
+++ b/libcopybit/copybit.cpp
@@ -122,8 +122,12 @@ static void set_image(struct mdp_img *img, const struct copybit_image_t *rhs)
     img->height     = rhs->h;
     img->format     = get_format(rhs->format);
     img->offset     = hnd->offset;
+#if defined(COPYBIT_MSM7K)
     img->memory_id  = (hnd->flags & private_handle_t::PRIV_FLAGS_USES_GPU)
         ? hnd->gpu_fd : hnd->fd;
+#else
+    img->memory_id  = hnd->fd;
+#endif
 }
 /** setup rectangles */
 static void set_rects(struct copybit_context_t *dev,