diff options
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | mm-core/Android.mk | 8 | ||||
| -rw-r--r-- | mm-core/src/8909/registry_table.c (renamed from mm-core/src/ferrum/registry_table.c) | 0 | ||||
| -rw-r--r-- | mm-core/src/8909/registry_table_android.c (renamed from mm-core/src/ferrum/registry_table_android.c) | 0 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 6 |
6 files changed, 13 insertions, 13 deletions
@@ -1,17 +1,17 @@ QCOM_MEDIA_ROOT := $(call my-dir) -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 ferrum thulium,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 ferrum thulium,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 ferrum,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk endif -ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092 msm_bronze msm8916 msm8994 ferrum thulium,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif diff --git a/mm-core/Android.mk b/mm-core/Android.mk index eecdd6e8..f8fd2114 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -30,8 +30,8 @@ else ifeq ($(TARGET_BOARD_PLATFORM),msm8226) MM_CORE_TARGET = 8226 else ifeq ($(TARGET_BOARD_PLATFORM),msm8916) MM_CORE_TARGET = 8916 -else ifeq ($(TARGET_BOARD_PLATFORM),ferrum) -MM_CORE_TARGET = ferrum +else ifeq ($(TARGET_BOARD_PLATFORM),msm8909) +MM_CORE_TARGET = 8909 else ifeq ($(TARGET_BOARD_PLATFORM),apq8084) MM_CORE_TARGET = 8084 else ifeq ($(TARGET_BOARD_PLATFORM),mpq8092) @@ -91,7 +91,7 @@ LOCAL_CFLAGS := $(OMXCORE_CFLAGS) LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp LOCAL_SRC_FILES += src/common/qc_omx_core.c -ifneq (,$(filter msm8916 msm8994 ferrum thulium,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM))) LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/registry_table_android.c else LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/qc_registry_table_android.c @@ -115,7 +115,7 @@ LOCAL_CFLAGS := $(OMXCORE_CFLAGS) LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp LOCAL_SRC_FILES += src/common/qc_omx_core.c -ifneq (,$(filter msm8916 msm8994 ferrum thulium,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM))) LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/registry_table.c else LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/qc_registry_table.c diff --git a/mm-core/src/ferrum/registry_table.c b/mm-core/src/8909/registry_table.c index cf2e4011..cf2e4011 100644 --- a/mm-core/src/ferrum/registry_table.c +++ b/mm-core/src/8909/registry_table.c diff --git a/mm-core/src/ferrum/registry_table_android.c b/mm-core/src/8909/registry_table_android.c index 8d54bda8..8d54bda8 100644 --- a/mm-core/src/ferrum/registry_table_android.c +++ b/mm-core/src/8909/registry_table_android.c diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 982052f8..2cba6b50 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -89,7 +89,7 @@ libOmxVdec-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT libOmxVdec-def += -D_MSM8974_ endif -ifeq ($(TARGET_BOARD_PLATFORM),ferrum) +ifeq ($(TARGET_BOARD_PLATFORM),msm8909) libOmxVdec-def += -DMAX_RES_1080P libOmxVdec-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT @@ -163,7 +163,7 @@ LOCAL_SRC_FILES += src/ts_parser.cpp LOCAL_SRC_FILES += src/mp4_utils.cpp LOCAL_SRC_FILES += src/hevc_utils.cpp LOCAL_STATIC_LIBRARIES := libOmxVidcCommon -ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916 msm8994 ferrum,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM))) LOCAL_SRC_FILES += src/omx_vdec_msm8974.cpp endif diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index d5c60ea7..dd4418aa 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -79,7 +79,7 @@ libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT libmm-venc-def += -D_MSM8974_ libmm-venc-def += -D_MSM8226_ endif -ifeq ($(TARGET_BOARD_PLATFORM),ferrum) +ifeq ($(TARGET_BOARD_PLATFORM),msm8909) libmm-venc-def += -DMAX_RES_1080P libmm-venc-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT @@ -130,7 +130,7 @@ LOCAL_STATIC_LIBRARIES := libOmxVidcCommon LOCAL_SRC_FILES := src/omx_video_base.cpp LOCAL_SRC_FILES += src/omx_video_encoder.cpp -ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916 msm8994 ferrum,$(TARGET_BOARD_PLATFORM))) +ifneq (,$(filter msm8974 msm8610 msm8226 apq8084 mpq8092 msm_bronze msm8916 msm8994 msm8909,$(TARGET_BOARD_PLATFORM))) LOCAL_SRC_FILES += src/video_encoder_device_v4l2.cpp else LOCAL_SRC_FILES += src/video_encoder_device.cpp @@ -141,7 +141,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr include $(BUILD_SHARED_LIBRARY) -ifeq ($(TARGET_BOARD_PLATFORM),ferrum) +ifeq ($(TARGET_BOARD_PLATFORM),msm8909) # --------------------------------------------------------------------------------- # Make the Shared library (libOmxSwVencMpeg4) # --------------------------------------------------------------------------------- |