Merge "media: Fix image grid control setting for non-HEIC roles" into video-userspace.lnx.7.3.9
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 63716a6..6a9c691 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -16,8 +16,8 @@
MM_CORE_TARGET = sdm845
else ifeq ($(filter $(TARGET_BOARD_PLATFORM), msmpeafowl),$(TARGET_BOARD_PLATFORM))
MM_CORE_TARGET = msmpeafowl
-else ifeq ($(filter $(TARGET_BOARD_PLATFORM), sdm670),$(TARGET_BOARD_PLATFORM))
-MM_CORE_TARGET = sdm670
+else ifeq ($(filter $(TARGET_BOARD_PLATFORM), sdm710),$(TARGET_BOARD_PLATFORM))
+MM_CORE_TARGET = sdm710
else ifeq ($(filter $(TARGET_BOARD_PLATFORM), qcs605),$(TARGET_BOARD_PLATFORM))
MM_CORE_TARGET = qcs605
else
@@ -79,7 +79,7 @@
LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp
LOCAL_SRC_FILES += src/common/qc_omx_core.c
-ifneq (,$(filter sdm845 msmpeafowl sdm670 qcs605,$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter sdm845 msmpeafowl sdm710 qcs605,$(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
@@ -111,7 +111,7 @@
LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp
LOCAL_SRC_FILES += src/common/qc_omx_core.c
-ifneq (,$(filter sdm845 msmpeafowl sdm670 qcs605,$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter sdm845 msmpeafowl sdm710 qcs605,$(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/sdm670/registry_table.c b/mm-core/src/sdm710/registry_table.c
similarity index 100%
rename from mm-core/src/sdm670/registry_table.c
rename to mm-core/src/sdm710/registry_table.c
diff --git a/mm-core/src/sdm670/registry_table_android.c b/mm-core/src/sdm710/registry_table_android.c
similarity index 100%
rename from mm-core/src/sdm670/registry_table_android.c
rename to mm-core/src/sdm710/registry_table_android.c
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index c075530..84ee185 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -24,8 +24,8 @@
libmm-vdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
TARGETS_THAT_HAVE_VENUS_HEVC := apq8084 msm8994 msm8996
-TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8953 msm8998 sdm660 sdm845 msmpeafowl sdm670 qcs605
-TARGETS_THAT_NEED_SW_VDEC := msm8937 sdm845 msmpeafowl sdm670 qcs605
+TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8953 msm8998 sdm660 sdm845 msmpeafowl sdm710 qcs605
+TARGETS_THAT_NEED_SW_VDEC := msm8937 sdm845 msmpeafowl sdm710 qcs605
ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_HAVE_VENUS_HEVC)),true)
libmm-vdec-def += -DVENUS_HEVC
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 7f14d33..a3617d0 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -21,11 +21,11 @@
libmm-venc-def += -D_ANDROID_ICS_
TARGETS_THAT_USE_FLAG_MSM8226 := msm8226 msm8916 msm8909
-TARGETS_THAT_NEED_SW_VENC_MPEG4 := msm8909 msm8937 sdm845 msmpeafowl sdm670 qcs605
+TARGETS_THAT_NEED_SW_VENC_MPEG4 := msm8909 msm8937 sdm845 msmpeafowl sdm710 qcs605
TARGETS_THAT_NEED_SW_VENC_HEVC := msm8992
-TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8998 sdm845 msmpeafowl sdm670 qcs605
+TARGETS_THAT_SUPPORT_UBWC := msm8996 msm8998 sdm845 msmpeafowl sdm710 qcs605
TARGETS_THAT_SUPPORT_VQZIP := msm8996 msm8998
-TARGETS_THAT_SUPPORT_SW_VENC_ROTATION := sdm845 msmpeafowl sdm670 qcs605
+TARGETS_THAT_SUPPORT_SW_VENC_ROTATION := sdm845 msmpeafowl sdm710 qcs605
ifeq ($(TARGET_BOARD_PLATFORM),msm8610)
libmm-venc-def += -D_MSM8610_
