commit 3f693eb932db873b360188be0787b85007219fad
author Android (Google) Code Review <android-gerrit@google.com> Mon Dec 07 09:57:12 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 07 09:57:12 2009 -0800
tree 5ac1a5f972fd73b7852dc17a5f91c8ec82576923
parent b3150e8599ecabe5c97f2d4850fd120b50cd3fc3
parent 04de25cee8a44caa8686bc164ece762d136f4f33

Merge change I91eb0354 into eclair-mr2

* changes:
  Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.

libs/surfaceflinger/Android.mk

diff --git a/libs/surfaceflinger/Android.mk b/libs/surfaceflinger/Android.mk
index eb51c22..b3fed58 100644
--- a/libs/surfaceflinger/Android.mk
+++ b/libs/surfaceflinger/Android.mk
@@ -22,9 +22,6 @@
 ifeq ($(TARGET_BOARD_PLATFORM), msm7k)
 	LOCAL_CFLAGS += -DDIM_WITH_TEXTURE
 endif
-ifeq ($(TARGET_BOARD_PLATFORM), qsd8k)
-	LOCAL_CFLAGS += -DDIM_WITH_TEXTURE
-endif
 
 # need "-lrt" on Linux simulator to pick up clock_gettime
 ifeq ($(TARGET_SIMULATOR),true)