diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2014-05-19 15:45:06 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-05-19 22:56:14 +0000 |
| commit | e2bf6477e0daaf9dd31b5094ecc501279c8feb2e (patch) | |
| tree | 0a792fad36d349ddb36327cfec5ec64b0bc656b5 | |
| parent | 6a8a8b7efb8ab2ddee700968e85c6b52ba087abf (diff) | |
| download | media-e2bf6477e0daaf9dd31b5094ecc501279c8feb2e.tar.gz | |
Makefile: rename apq8084 to msm8084
Change-Id: If545d5fa5c4ff4159bf780024cef98ae11c76303
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc.mk | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ QCOM_MEDIA_ROOT := $(call my-dir) -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index 2818db2..be8d669 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -63,7 +63,7 @@ libOmxVdec-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT libOmxVdec-def += -D_MSM8974_ endif -ifeq ($(TARGET_BOARD_PLATFORM),apq8084) +ifeq ($(TARGET_BOARD_PLATFORM),msm8084) libOmxVdec-def += -DMAX_RES_1080P libOmxVdec-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT @@ -121,7 +121,7 @@ LOCAL_SRC_FILES += vdec/src/h264_utils.cpp LOCAL_SRC_FILES += vdec/src/ts_parser.cpp LOCAL_SRC_FILES += vdec/src/mp4_utils.cpp LOCAL_SRC_FILES += vdec/src/hevc_utils.cpp -ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8610 msm8226 msm8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware diff --git a/mm-video-v4l2/vidc/venc.mk b/mm-video-v4l2/vidc/venc.mk index 3547b6b..ae3de49 100644 --- a/mm-video-v4l2/vidc/venc.mk +++ b/mm-video-v4l2/vidc/venc.mk @@ -50,7 +50,7 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm8226) libmm-venc-def += -DMAX_RES_1080P libmm-venc-def += -D_MSM8974_ endif -ifeq ($(TARGET_BOARD_PLATFORM),apq8084) +ifeq ($(TARGET_BOARD_PLATFORM),msm8084) libmm-venc-def += -DMAX_RES_1080P libmm-venc-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT @@ -101,7 +101,7 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ LOCAL_SRC_FILES := venc/src/omx_video_base.cpp LOCAL_SRC_FILES += venc/src/omx_video_encoder.cpp -ifneq ($(filter msm8974 msm8610 msm8226 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8610 msm8226 msm8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) LOCAL_SRC_FILES += venc/src/video_encoder_device_v4l2.cpp else LOCAL_SRC_FILES += venc/src/video_encoder_device.cpp |