s/exynos7570/exynos7580/

Change-Id: I4a613aba1955b58aa2aa9617354d1d2760fafb19

diff --git a/Android.mk b/Android.mk
index 070727020c7b36b08425a4a850023aafb9e5de95..979b04cb21022dff1d8334793b42a90bd7430feb 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -14,24 +14,24 @@
 # limitations under the License.
 #
 
-ifeq ($(TARGET_SOC), exynos7570)
-exynos7570_dirs := \
+ifeq ($(TARGET_SOC), exynos7580)
+exynos7580_dirs := \
        libgatekeeper \
        libkeymaster \
 
 ifeq ($(BOARD_BACK_CAMERA_USES_EXTERNAL_CAMERA), true)
-exynos7570_dirs += \
+exynos7580_dirs += \
        libcamera_external
 else ifeq ($(BOARD_FRONT_CAMERA_USES_EXTERNAL_CAMERA), true)
-exynos7570_dirs += \
+exynos7580_dirs += \
        libcamera_external
 else
-exynos7570_dirs += \
+exynos7580_dirs += \
        libcamera \
        libcamera3 \
        libcameraInterface
 endif
 
-include $(call all-named-subdir-makefiles,$(exynos7570_dirs))
+include $(call all-named-subdir-makefiles,$(exynos7580_dirs))
 
 endif

diff --git a/exynos7570.mk b/exynos7570.mk
deleted file mode 100644 (file)
index d505c81..0000000
--- a/exynos7570.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# video codecs
-PRODUCT_PACKAGES := \
-       libOMX.Exynos.MPEG4.Decoder \
-       libOMX.Exynos.AVC.Decoder \
-       libOMX.Exynos.WMV.Decoder \
-       libOMX.Exynos.VP8.Decoder \
-       libOMX.Exynos.HEVC.Decoder \
-       libOMX.Exynos.MPEG4.Encoder \
-       libOMX.Exynos.AVC.Encoder \
-       libOMX.Exynos.VP8.Encoder \
-       libOMX.Exynos.HEVC.Encoder
-
-# stagefright and device specific modules
-PRODUCT_PACKAGES += \
-       libstagefrighthw \
-       libExynosOMX_Core \
-       libExynosOMX_Resourcemanager

diff --git a/exynos7580.mk b/exynos7580.mk
new file mode 100644 (file)
index 0000000..d505c81
--- /dev/null
+++ b/exynos7580.mk
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# video codecs
+PRODUCT_PACKAGES := \
+       libOMX.Exynos.MPEG4.Decoder \
+       libOMX.Exynos.AVC.Decoder \
+       libOMX.Exynos.WMV.Decoder \
+       libOMX.Exynos.VP8.Decoder \
+       libOMX.Exynos.HEVC.Decoder \
+       libOMX.Exynos.MPEG4.Encoder \
+       libOMX.Exynos.AVC.Encoder \
+       libOMX.Exynos.VP8.Encoder \
+       libOMX.Exynos.HEVC.Encoder
+
+# stagefright and device specific modules
+PRODUCT_PACKAGES += \
+       libstagefrighthw \
+       libExynosOMX_Core \
+       libExynosOMX_Resourcemanager

diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 15b664073ccc8649dab2e1d86b990a237aba3ed7..cb4731b6e803d7eb91ad8c18512a2f4b49f668ec 100644 (file)
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -72,7 +72,7 @@ LOCAL_C_INCLUDES += \
        $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/libcamera \
-       $(TOP)/hardware/samsung_slsi/exynos7570/libcamera \
+       $(TOP)/hardware/samsung_slsi/exynos7580/libcamera \
        $(TOP)/hardware/libhardware_legacy/include/hardware_legacy \
        $(TOP)/vendor/samsung/feature/CscFeature/libsecnativefeature \
        $(TOP)/bionic \

diff --git a/libcameraInterface/Android.mk b/libcameraInterface/Android.mk
index 963e4893c77ff952c6a835c752793cd30c6e7af2..1878629f802fa6e57f062ff12bf4dd30bd56d517 100644 (file)
--- a/libcameraInterface/Android.mk
+++ b/libcameraInterface/Android.mk
@@ -15,7 +15,7 @@
 LOCAL_PATH:= $(call my-dir)
 
 #################
-# camera.exynos7570.so
+# camera.exynos7580.so
 
 include $(CLEAR_VARS)