summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJef Oliver <jgoliver@jeago.com>2012-05-09 23:48:30 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-05-09 23:48:31 +0400
commit0d904c2944e10e939d6e9463ca9e63c24df7f61f (patch)
treeab6cd5d4da7e6c863fb50dfce4301443bdc6905a /media
parent405fc296b35704b084062c644165a6ca8528d638 (diff)
parentb2bc6264d7ac94e393b619dfd6f9e2ff4714ab0d (diff)
downloadframeworks_base-0d904c2944e10e939d6e9463ca9e63c24df7f61f.zip
frameworks_base-0d904c2944e10e939d6e9463ca9e63c24df7f61f.tar.gz
frameworks_base-0d904c2944e10e939d6e9463ca9e63c24df7f61f.tar.bz2
Merge "media: stagefright: add msm8960 target support" into ics
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index ed63d5d..976dcbf 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -21,6 +21,9 @@ endif
ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
LOCAL_CFLAGS += -DTARGET8x60
endif
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
+ LOCAL_CFLAGS += -DTARGET8x60
+endif
endif
include frameworks/base/media/libstagefright/codecs/common/Config.mk