diff options
| author | Patrick Tjin <pattjin@google.com> | 2016-03-07 08:50:57 -0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2016-03-07 09:14:01 -0800 |
| commit | e4010605f233a213cf0d972397bb33c34c364227 (patch) | |
| tree | 43e1d85cef14ff56bf7079d27e5a53229cb8eef1 /Android.mk | |
| parent | 9841688286f54c2267446b04d5386574a73502b7 (diff) | |
| download | media-e4010605f233a213cf0d972397bb33c34c364227.tar.gz | |
Initial import of msm8996 media HAL
1) Move existing HAL to msm8974/
2) Import msm8996 HAL from LA.HB.1.1.2_rb1.12
3) Modify Makefiles to remove kernel dependencies and
fix for new directory structure
4) Modify top level makefile for new directory structure
Top commits from LA.HB.1.1.2_rb1.12 included in this commit:
db7937a mm-video: vidc: memset struct v4l2_format prior to S_FMT
d77ab10 Merge "mm-video-v4l2: vidc: Do not queue output buffer if flush is in progress"
8895985 mm-video-v4l2: vidc: vdec: Add property to disable UBWC for OPB
675af75 Merge "mm-video: vidc: Communicate the right colorformat to the driver"
dd79df2 Merge "mm-video: vidc: Reliably stop the message thread"
c3e8618 Merge "mm-video-v4l2: vidc: venc: Fix B-Frame handling"
755ec08 mm-video-v4l2: vidc: Do not queue output buffer if flush is in progress
3ac8410 mm-video: vidc: Reliably stop the message thread
b73dcba Merge "mm-video-v4l2: vidc: venc: Bug fixes for VZIP"
8358109 Merge "mm-video-v4l2: vdec: fix picture type decode mode return status"
BUG=27420204
Signed-off-by: Patrick Tjin <pattjin@google.com>
Change-Id: I71aa0190e48b332268334677894b0ad7c606296b
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -1,7 +1,14 @@ # TODO: Find a better way to separate build configs for ADP vs non-ADP devices ifneq ($(TARGET_BOARD_AUTO),true) - QCOM_MEDIA_ROOT := $(call my-dir) - ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) + # for msm8996 targets, use the msm8996 directory, for all other targets + # use the msm8974 directory. + ifneq ($(filter msm8996, $(TARGET_BOARD_PLATFORM)),) + QCOM_MEDIA_ROOT := $(call my-dir)/msm8996 + else + QCOM_MEDIA_ROOT := $(call my-dir)/msm8974 + endif + + ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif @@ -10,11 +17,11 @@ ifneq ($(TARGET_BOARD_AUTO),true) include $(QCOM_MEDIA_ROOT)/mm-video-legacy/Android.mk endif - ifneq ($(filter msm8610 msm8226 msm8974 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8610 msm8226 msm8974 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk endif - ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif endif |