diff options
| author | Praveen Chavan <pchavan@codeaurora.org> | 2013-07-26 13:58:34 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2013-08-19 13:51:35 -0700 |
| commit | 61a2c6a19dbd06a317a419623020e02056661876 (patch) | |
| tree | 2b847df9953c9e0878fa057fce7e1710d3da00f1 /Android.mk | |
| parent | ef9f063d42b853c174d5012d4dcf18bec02fe48a (diff) | |
| download | media-61a2c6a19dbd06a317a419623020e02056661876.tar.gz | |
Merge up to tip (906de570) of hardware/qcom/media from codeaurora.org
Change-Id: Iee6f5ea3781748209b02725b30f2c09a8f1392fa
Signed-off-by: Ajay Dudani <adudani@codeaurora.org>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,17 @@ -ifneq ($(filter msm8960 msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),) +QCOM_MEDIA_ROOT := $(call my-dir) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk +include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk +endif + +ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),) +include $(QCOM_MEDIA_ROOT)/mm-video-legacy/Android.mk +endif -include $(call all-subdir-makefiles) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk +endif +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif |