openmax: update paths
Change-Id: I51571a94d7d021fc8d849813538dbfd25ced6f6d
diff --git a/openmax/Android.mk b/openmax/Android.mk
index af59183..a90f254 100644
--- a/openmax/Android.mk
+++ b/openmax/Android.mk
@@ -25,10 +25,10 @@
ifeq ($(BOARD_USE_ALP_AUDIO), true)
ifeq ($(BOARD_USE_SEIREN_AUDIO), true)
EXYNOS_AUDIO_CODEC += \
- hardware/samsung_slsi/exynos/libseiren
+ hardware/samsung_slsi-linaro/exynos/libseiren
else
EXYNOS_AUDIO_CODEC += \
- hardware/samsung_slsi/exynos/libsrp
+ hardware/samsung_slsi-linaro/exynos/libsrp
endif
endif
diff --git a/openmax/component/video/dec/Android.mk b/openmax/component/video/dec/Android.mk
index 31d7697..e842922 100644
--- a/openmax/component/video/dec/Android.mk
+++ b/openmax/component/video/dec/Android.mk
@@ -19,7 +19,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
LOCAL_STATIC_LIBRARIES := libExynosVideoApi libExynosOMX_OSAL
LOCAL_SHARED_LIBRARIES := liblog
diff --git a/openmax/component/video/dec/h264/Android.mk b/openmax/component/video/dec/h264/Android.mk
index d59ff5d..d197cd4 100644
--- a/openmax/component/video/dec/h264/Android.mk
+++ b/openmax/component/video/dec/h264/Android.mk
@@ -67,7 +67,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_SKYPE_HD), true)
LOCAL_CFLAGS += -DUSE_SKYPE_HD
diff --git a/openmax/component/video/dec/hevc/Android.mk b/openmax/component/video/dec/hevc/Android.mk
index 1ab4312..2f120c9 100644
--- a/openmax/component/video/dec/hevc/Android.mk
+++ b/openmax/component/video/dec/hevc/Android.mk
@@ -68,7 +68,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/mpeg2/Android.mk b/openmax/component/video/dec/mpeg2/Android.mk
index de6b8dc..5abda61 100644
--- a/openmax/component/video/dec/mpeg2/Android.mk
+++ b/openmax/component/video/dec/mpeg2/Android.mk
@@ -63,7 +63,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/mpeg4/Android.mk b/openmax/component/video/dec/mpeg4/Android.mk
index ba633e0..ef4bb24 100644
--- a/openmax/component/video/dec/mpeg4/Android.mk
+++ b/openmax/component/video/dec/mpeg4/Android.mk
@@ -63,7 +63,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/vc1/Android.mk b/openmax/component/video/dec/vc1/Android.mk
index 003dbd5..68b34ac 100644
--- a/openmax/component/video/dec/vc1/Android.mk
+++ b/openmax/component/video/dec/vc1/Android.mk
@@ -63,7 +63,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/vp8/Android.mk b/openmax/component/video/dec/vp8/Android.mk
index 81a9dd0..b4c42c9 100644
--- a/openmax/component/video/dec/vp8/Android.mk
+++ b/openmax/component/video/dec/vp8/Android.mk
@@ -64,7 +64,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/vp9/Android.mk b/openmax/component/video/dec/vp9/Android.mk
index 3537936..01e89c1 100644
--- a/openmax/component/video/dec/vp9/Android.mk
+++ b/openmax/component/video/dec/vp9/Android.mk
@@ -64,7 +64,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/Android.mk b/openmax/component/video/enc/Android.mk
index feaea1a..9c1fe4a 100644
--- a/openmax/component/video/enc/Android.mk
+++ b/openmax/component/video/enc/Android.mk
@@ -19,7 +19,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/h264/Android.mk b/openmax/component/video/enc/h264/Android.mk
index f26fe52..d28b602 100644
--- a/openmax/component/video/enc/h264/Android.mk
+++ b/openmax/component/video/enc/h264/Android.mk
@@ -59,7 +59,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_SKYPE_HD), true)
LOCAL_CFLAGS += -DUSE_SKYPE_HD
diff --git a/openmax/component/video/enc/h264wfd/Android.mk b/openmax/component/video/enc/h264wfd/Android.mk
index 88cb813..5459e1f 100644
--- a/openmax/component/video/enc/h264wfd/Android.mk
+++ b/openmax/component/video/enc/h264wfd/Android.mk
@@ -54,7 +54,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/hevc/Android.mk b/openmax/component/video/enc/hevc/Android.mk
index bdbca8e..03569f1 100644
--- a/openmax/component/video/enc/hevc/Android.mk
+++ b/openmax/component/video/enc/hevc/Android.mk
@@ -60,7 +60,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/hevcwfd/Android.mk b/openmax/component/video/enc/hevcwfd/Android.mk
index 30514f8..96721a6 100644
--- a/openmax/component/video/enc/hevcwfd/Android.mk
+++ b/openmax/component/video/enc/hevcwfd/Android.mk
@@ -54,7 +54,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/mpeg4/Android.mk b/openmax/component/video/enc/mpeg4/Android.mk
index 2e770f9..d6dc7e5 100644
--- a/openmax/component/video/enc/mpeg4/Android.mk
+++ b/openmax/component/video/enc/mpeg4/Android.mk
@@ -59,7 +59,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/vp8/Android.mk b/openmax/component/video/enc/vp8/Android.mk
index e4fe725..fcf6c9b 100644
--- a/openmax/component/video/enc/vp8/Android.mk
+++ b/openmax/component/video/enc/vp8/Android.mk
@@ -60,7 +60,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/vp9/Android.mk b/openmax/component/video/enc/vp9/Android.mk
index 401d421..13deb74 100644
--- a/openmax/component/video/enc/vp9/Android.mk
+++ b/openmax/component/video/enc/vp9/Android.mk
@@ -59,7 +59,7 @@
$(EXYNOS_OMX_COMPONENT)/common \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/osal/Android.mk b/openmax/osal/Android.mk
index 3e3b16f..4d55fdf 100644
--- a/openmax/osal/Android.mk
+++ b/openmax/osal/Android.mk
@@ -30,7 +30,7 @@
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_OMX_COMPONENT)/video/enc/h264 \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
@@ -77,7 +77,7 @@
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_OMX_COMPONENT)/video/dec/h264 \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
@@ -169,8 +169,8 @@
$(EXYNOS_OMX_COMPONENT)/video/dec \
$(EXYNOS_OMX_COMPONENT)/video/enc \
$(EXYNOS_VIDEO_CODEC)/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libion/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libion/include \
$(TOP)/system/core/libsystem/include/
ifeq ($(BOARD_USE_ANDROID), true)
diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index ef5b509..3e55de3 100644
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -11,14 +11,14 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/osal/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
LOCAL_SHARED_LIBRARIES := libion_exynos
LOCAL_SHARED_LIBRARIES += liblog
ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
-LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/openmax/include/khronos
+LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi-linaro/openmax/include/khronos
else
LOCAL_HEADER_LIBRARIES := media_plugin_headers
endif