Fix qcom hardware paths
Change-Id: I93ff2ff550965b5d383ad46dbc3a52bc4aeb10e8
diff --git a/conf_files/config.mk b/conf_files/config.mk
index 681e036..dd37710 100644
--- a/conf_files/config.mk
+++ b/conf_files/config.mk
@@ -1,5 +1,5 @@
ifeq ($(TARGET_BOARD_PLATFORM),msm8937)
-PRODUCT_COPY_FILES += hardware/qcom/media/conf_files/msm8937/media_profiles_8937.xml:system/etc/media_profiles.xml \
- hardware/qcom/media/conf_files/msm8937/media_codecs_8937.xml:system/etc/media_codecs.xml \
- hardware/qcom/media/conf_files/msm8937/media_codecs_performance_8937.xml:system/etc/media_codecs_performance.xml
+PRODUCT_COPY_FILES += hardware/qcom/sm8150/media/conf_files/msm8937/media_profiles_8937.xml:system/etc/media_profiles.xml \
+ hardware/qcom/sm8150/media/conf_files/msm8937/media_codecs_8937.xml:system/etc/media_codecs.xml \
+ hardware/qcom/sm8150/media/conf_files/msm8937/media_codecs_performance_8937.xml:system/etc/media_codecs_performance.xml
endif #TARGET_BOARD_PLATFORM
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 4e3760c..4fedec6 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -12,7 +12,7 @@
# Figure out the targets
#===============================================================================
-ifeq ($(filter $(TARGET_BOARD_PLATFORM), msmnile),$(TARGET_BOARD_PLATFORM))
+ifeq ($(filter $(TARGET_BOARD_PLATFORM), msmnile sm8150),$(TARGET_BOARD_PLATFORM))
OMXCORE_CFLAGS += -D_NILE_
else ifeq ($(filter $(TARGET_BOARD_PLATFORM), $(MSMSTEPPE)),$(TARGET_BOARD_PLATFORM))
OMXCORE_CFLAGS += -D_STEPPE_
@@ -79,7 +79,7 @@
LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp
LOCAL_SRC_FILES += src/common/qc_omx_core.c
-ifneq (,$(filter msmnile $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter msmnile sm8150 $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
LOCAL_SRC_FILES += src/registry_table_android.c
else
LOCAL_SRC_FILES += src/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 msmnile $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter msmnile sm8150 $(MSMSTEPPE),$(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-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk
index 5e85a12..cf1b31c 100644
--- a/mm-video-v4l2/vidc/common/Android.mk
+++ b/mm-video-v4l2/vidc/common/Android.mk
@@ -21,9 +21,9 @@
# ---------------------------------------------------------------------------------
libmm-vidc-inc := $(LOCAL_PATH)/inc
-libmm-vidc-inc += $(TOP)/hardware/qcom/media/mm-core/inc
+libmm-vidc-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc
libmm-vidc-inc += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-vidc-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert
+libmm-vidc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert
libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_MODULE := libOmxVidcCommon
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 90c599d..d75f9bc 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -58,16 +58,15 @@
libmm-vdec-inc := $(LOCAL_PATH)/inc
libmm-vdec-inc += $(TOP)/system/core/libion/include
libmm-vdec-inc += $(TOP)/system/core/libion/kernel-headers
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc
-libmm-vdec-inc += hardware/qcom/media/libplatformconfig
+libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/mm-video-v4l2/vidc/common/inc
+libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc
+libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libplatformconfig
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert
-libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec
-libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/swvdec
-libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-
+libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert
+libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec
+libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/swvdec
+libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2
libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1
libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw
@@ -113,6 +112,7 @@
LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
LOCAL_SHARED_LIBRARIES += libqdMetaData
LOCAL_SHARED_LIBRARIES += libplatformconfig
+LOCAL_SHARED_LIBRARIES += libnativewindow
LOCAL_SRC_FILES := src/ts_parser.cpp
LOCAL_STATIC_LIBRARIES := libOmxVidcCommon
@@ -147,6 +147,7 @@
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libcutils libc2dcolorconvert libion
LOCAL_SHARED_LIBRARIES += libswvdec
+LOCAL_SHARED_LIBRARIES += libnativewindow
LOCAL_SRC_FILES := src/omx_swvdec.cpp
LOCAL_SRC_FILES += src/omx_swvdec_utils.cpp
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 07f08e5..6dba441 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -55,15 +55,15 @@
# Common Includes
libmm-venc-inc := $(LOCAL_PATH)/inc
-libmm-venc-inc += $(TOP)/system/core/libion/include
+libmm-venc-inc += $(TOP)/core/libion/include
libmm-venc-inc += $(TOP)/system/core/libion/kernel-headers
-libmm-venc-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc
-libmm-venc-inc += hardware/qcom/media/mm-core/inc
-libmm-venc-inc += hardware/qcom/media/libstagefrighthw
-libmm-venc-inc += hardware/qcom/media/libplatformconfig
+libmm-venc-inc += $(QCOM_MEDIA_ROOT)/mm-video-v4l2/vidc/common/inc
+libmm-venc-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc
+libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libstagefrighthw
+libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libplatformconfig
libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display
+libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert
libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno
-libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert
libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip
libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
libmm-venc-inc += $(TOP)/frameworks/native/libs/nativewindow/include
@@ -100,6 +100,7 @@
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig libion
+LOCAL_SHARED_LIBRARIES += libnativewindow
# ifeq ($(BOARD_USES_ADRENO), true)
LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
@@ -141,6 +142,7 @@
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libplatformconfig libion
LOCAL_SHARED_LIBRARIES += libMpeg4SwEncoder
LOCAL_SHARED_LIBRARIES += libqdMetaData
+LOCAL_SHARED_LIBRARIES += libnativewindow
ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_SUPPORT_SW_VENC_ROTATION)),true)
LOCAL_SHARED_LIBRARIES += libui