summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/colorconversion
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-18 08:47:03 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-10-18 08:47:03 -0700
commitc540e63b50c214ccb0eabc93806a64c5b145d110 (patch)
treecf0ac508bec50426fa579bfbbdc3ad1aaddc51b7 /media/libstagefright/colorconversion
parent1691a76853244cf18621ebca8c0f5430f826c265 (diff)
downloadframeworks_av-c540e63b50c214ccb0eabc93806a64c5b145d110.zip
frameworks_av-c540e63b50c214ccb0eabc93806a64c5b145d110.tar.gz
frameworks_av-c540e63b50c214ccb0eabc93806a64c5b145d110.tar.bz2
Fix build (bad merge)
Bug: 3101573 Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
Diffstat (limited to 'media/libstagefright/colorconversion')
-rw-r--r--media/libstagefright/colorconversion/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk
index 40be0f9..ef2dba0 100644
--- a/media/libstagefright/colorconversion/Android.mk
+++ b/media/libstagefright/colorconversion/Android.mk
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES:= \
SoftwareRenderer.cpp
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/base/include/media/stagefright/openmax
+ $(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/hardware/msm7k
LOCAL_SHARED_LIBRARIES := \