commit e6855eb7cc8746ead9d7e1dba1847b41efc696ff
author Xin Li <delphij@google.com> Mon Aug 24 15:53:43 2020 -0700
committer Xin Li <delphij@google.com> Mon Aug 24 15:53:43 2020 -0700
tree d0babc5023fd95fac9ff2cdf3cf211ef48787227
parent 8d234e9c394363505f68128daac91e2758da920f
parent 7ceded6e796a3d0a853db0df28e8d52d9d7c8217

Merge QD4A.200805.003.

Bug: 160260413
Change-Id: I008bfe61c4819d1b58cd8ba3b8a18be18ab2bec2

mm-video-v4l2/vidc/vdec/Android.mk

diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 630c8b7..58b2908 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -56,8 +56,8 @@
 
 # Common Includes
 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)/system/memory/libion/include
+libmm-vdec-inc          += $(TOP)/system/memory/libion/kernel-headers
 libmm-vdec-inc          += $(TOP)/$(QCOM_MEDIA_ROOT)/mm-video-v4l2/vidc/common/inc
 libmm-vdec-inc          += $(TOP)/$(QCOM_MEDIA_ROOT)/mm-core/inc
 libmm-vdec-inc          += $(QCOM_MEDIA_ROOT)/libplatformconfig

mm-video-v4l2/vidc/venc/Android.mk

diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 29debbc..dc36308 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -64,8 +64,8 @@
 
 # Common Includes
 libmm-venc-inc      := $(LOCAL_PATH)/inc
-libmm-venc-inc      += $(TOP)/system/core/libion/include
-libmm-venc-inc      += $(TOP)/system/core/libion/kernel-headers
+libmm-venc-inc      += $(TOP)/system/memory/libion/include
+libmm-venc-inc      += $(TOP)/system/memory/libion/kernel-headers
 libmm-venc-inc      += $(TOP)/$(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