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

Merge change 9421

Browse Source 
* changes:
  should fix qsd8k builds
This commit is contained in:
Android (Google) Code Review
2009-07-31 16:33:44 -07:00
parent 813af83025 06bd510731
commit d4e15901aa
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcopybit/Android.mk
View File

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

4
libcopybit/copybit.cpp
View File

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