diff options
| author | Praveen Chavan <pchavan@codeaurora.org> | 2015-04-01 00:31:41 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2015-05-06 10:31:21 -0700 |
| commit | f3ca23b5bd0c3d78d321ccf5c5af5eb0d461ff1a (patch) | |
| tree | b50c06e3eabd3c5466d3617d41ee7134ee089456 /Android.mk | |
| parent | 18dd3aa0cd1132cb79ef25782c302f374574bae9 (diff) | |
| download | media-f3ca23b5bd0c3d78d321ccf5c5af5eb0d461ff1a.tar.gz | |
mm-video: merge up to CAF tip
merge up to "a78eeb68e340c
mm-video-v4l2: venc: update color format in port-def"
include
mm-video-v4l2: compilation fixes for C++11 compiler
Change-Id: I14daa9a47bb4da476395adec7af6427c5578f111
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ QCOM_MEDIA_ROOT := $(call my-dir) -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif @@ -8,10 +8,10 @@ ifneq ($(filter msm8960 msm8660,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-legacy/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif |