exynos: Update paths
Change-Id: I18d1eb0077d2089bbcf14bcba58e5a6a1787b70a
diff --git a/c2service/Android.bp b/c2service/Android.bp
index 8c45155..31613da 100644
--- a/c2service/Android.bp
+++ b/c2service/Android.bp
@@ -33,7 +33,7 @@
}
package {
- default_applicable_licenses: ["hardware_samsung_slsi_exynos_c2service_license"],
+ default_applicable_licenses: ["hardware_samsung_slsi-linaro_exynos_c2service_license"],
default_visibility: [ "//visibility:private" ],
}
@@ -41,7 +41,7 @@
// Added automatically by a large-scale-change
// See: http://go/android-license-faq
license {
- name: "hardware_samsung_slsi_exynos_c2service_license",
+ name: "hardware_samsung_slsi-linaro_exynos_c2service_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index eeec108..b092cb7 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -40,8 +40,8 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos5/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos5/include
LOCAL_SRC_FILES := \
format_chooser.cpp \
@@ -78,8 +78,8 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos5/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos5/include \
$(TOP)/system/core/libsync/include
LOCAL_SRC_FILES := \
diff --git a/gralloc1/Android.mk b/gralloc1/Android.mk
index d138066..fd1c7b5 100644
--- a/gralloc1/Android.mk
+++ b/gralloc1/Android.mk
@@ -26,8 +26,8 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos5/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos5/include \
$(TOP)/system/core/libsync/include
LOCAL_SRC_FILES := \
@@ -81,8 +81,8 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos5/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos5/include \
$(TOP)/system/core/libsync/include
LOCAL_SRC_FILES := \
diff --git a/gralloc3/Android.mk b/gralloc3/Android.mk
index 381ba8d..a445598 100644
--- a/gralloc3/Android.mk
+++ b/gralloc3/Android.mk
@@ -66,7 +66,7 @@
libsync libhardware libhidlbase libhidltransport
LOCAL_C_INCLUDES := \
- $(TOP)/hardware/samsung_slsi/exynos/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include
LOCAL_SRC_FILES := \
GrallocWrapper.cpp
diff --git a/gralloc3/src/Android.mk b/gralloc3/src/Android.mk
index 6f131c6..45936fb 100644
--- a/gralloc3/src/Android.mk
+++ b/gralloc3/src/Android.mk
@@ -156,7 +156,7 @@
endif
LOCAL_C_INCLUDES := $(MALI_LOCAL_PATH) $(MALI_DDK_INCLUDES) \
- $(TOP)/hardware/samsung_slsi/exynos/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include
# General compilation flags
LOCAL_CFLAGS := -Werror -DLOG_TAG=\"gralloc\" -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
@@ -470,7 +470,7 @@
endif
LOCAL_C_INCLUDES := $(MALI_LOCAL_PATH) $(MALI_DDK_INCLUDES) \
- $(TOP)/hardware/samsung_slsi/exynos/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include
# General compilation flags
LOCAL_CFLAGS := -Werror -DLOG_TAG=\"gralloc\" -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
diff --git a/gralloc4/interfaces/libs/drmutils/Android.bp b/gralloc4/interfaces/libs/drmutils/Android.bp
index 5bb53d3..1b0a0b1 100644
--- a/gralloc4/interfaces/libs/drmutils/Android.bp
+++ b/gralloc4/interfaces/libs/drmutils/Android.bp
@@ -35,7 +35,7 @@
],
include_dirs: [
".",
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
export_include_dirs: [
".",
diff --git a/gralloc4/src/4.x/Android.bp b/gralloc4/src/4.x/Android.bp
index 04fb064..5259060 100644
--- a/gralloc4/src/4.x/Android.bp
+++ b/gralloc4/src/4.x/Android.bp
@@ -83,7 +83,7 @@
":libgralloc_hidl_common_shared_metadata",
],
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
}
@@ -107,6 +107,6 @@
":libgralloc_hidl_common_shared_metadata",
],
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
}
diff --git a/gralloc4/src/core/Android.bp b/gralloc4/src/core/Android.bp
index dd21829..16ee201 100755
--- a/gralloc4/src/core/Android.bp
+++ b/gralloc4/src/core/Android.bp
@@ -115,7 +115,7 @@
"ip_info/video_format_manager.cpp",
],
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
static_libs: [
"libarect",
diff --git a/gralloc4/src/core/ip_info/hidl_defines.h b/gralloc4/src/core/ip_info/hidl_defines.h
index 0c3ee86..53e7844 100644
--- a/gralloc4/src/core/ip_info/hidl_defines.h
+++ b/gralloc4/src/core/ip_info/hidl_defines.h
@@ -50,7 +50,7 @@
/// PrivateFormat
/// Invariant: PrivateFormat should be non-overlapping with to PixelFormat
- /// From exynos definition hardware/samsung_slsi/exynos/include/exynos_format.h
+ /// From exynos definition hardware/samsung_slsi-linaro/exynos/include/exynos_format.h
PRIVATE_YCBCR_420_P_M = 0x101,
PRIVATE_YCBCR_420_SP_M = 0x105,
PRIVATE_YCBCR_420_SP_M_TILED = 0x107,
diff --git a/libaudio/audiohal_comv1/common_audiohal/Android.mk b/libaudio/audiohal_comv1/common_audiohal/Android.mk
index e40c5ae..1d98da5 100644
--- a/libaudio/audiohal_comv1/common_audiohal/Android.mk
+++ b/libaudio/audiohal_comv1/common_audiohal/Android.mk
@@ -24,7 +24,7 @@
audio_hw.c \
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/include/libaudio/audiohal_comv1 \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include/libaudio/audiohal_comv1 \
$(call include-path-for, audio-utils)
LOCAL_HEADER_LIBRARIES := libhardware_headers
diff --git a/libcamera3/common_v2/PlugIn/Android.mk b/libcamera3/common_v2/PlugIn/Android.mk
index d0a7f7a..80b30f1 100644
--- a/libcamera3/common_v2/PlugIn/Android.mk
+++ b/libcamera3/common_v2/PlugIn/Android.mk
@@ -9,10 +9,10 @@
LOCAL_MODULE := libexynoscamera_plugin
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2 \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2 \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
$(TOP)/bionic \
$(TOP)/frameworks/native/libs/binder/include
@@ -20,7 +20,7 @@
LOCAL_CFLAGS += -Wno-error=date-time
LOCAL_CFLAGS += -Wno-overloaded-virtual
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
@@ -31,10 +31,10 @@
LOCAL_MODULE := libexynoscamera_plugin_utils
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2 \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2 \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
$(TOP)/system/core/libion/include \
$(TOP)/bionic \
$(TOP)/frameworks/native/libs/binder/include
@@ -43,7 +43,7 @@
LOCAL_CFLAGS += -Wno-error=date-time
LOCAL_CFLAGS += -Wno-overloaded-virtual
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
# external plugins
diff --git a/libcamera3/common_v2/PlugIn/converter/libs/Android.mk b/libcamera3/common_v2/PlugIn/converter/libs/Android.mk
index 98e6b27..8fd8e91 100644
--- a/libcamera3/common_v2/PlugIn/converter/libs/Android.mk
+++ b/libcamera3/common_v2/PlugIn/converter/libs/Android.mk
@@ -3,7 +3,7 @@
ifeq ($(BOARD_CAMERA_USES_DUAL_CAMERA_SOLUTION_FAKE), true)
LOCAL_CFLAGS += -DUSES_DUAL_CAMERA_SOLUTION_FAKE
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/converter/libs/libFakeFusion
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/converter/libs/libFakeFusion
LOCAL_SRC_FILES += \
../../exynos/libcamera3/common_v2/PlugIn/converter/libs/libFakeFusion/ExynosCameraPlugInConverterFakeFusion.cpp
endif
@@ -11,7 +11,7 @@
ifeq ($(BOARD_CAMERA_USES_DUAL_CAMERA_SOLUTION_ARCSOFT), true)
LOCAL_CFLAGS += -DUSES_DUAL_CAMERA_SOLUTION_ARCSOFT
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera/common_v3/PlugIn/converter/libs/libArcsoftFusion
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera/common_v3/PlugIn/converter/libs/libArcsoftFusion
LOCAL_SRC_FILES += \
../../exynos/libcamera3/common_v2/PlugIn/converter/libs/libArcsoftFusion/ExynosCameraPlugInConverterArcsoftFusion.cpp \
../../exynos/libcamera3/common_v2/PlugIn/converter/libs/libArcsoftFusion/ExynosCameraPlugInConverterArcsoftFusionBokehCapture.cpp \
@@ -23,7 +23,7 @@
ifeq ($(BOARD_CAMERA_USES_LLS_SOLUTION), true)
LOCAL_CFLAGS += -DUSES_LLS_SOLUTION
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/converter/libs/libLLS
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/converter/libs/libLLS
LOCAL_SRC_FILES += \
../../exynos/libcamera3/common_v2/PlugIn/converter/libs/libLLS/ExynosCameraPlugInConverterLowLightShot.cpp
endif
@@ -31,7 +31,7 @@
ifeq ($(BOARD_CAMERA_USES_CAMERA_SOLUTION_VDIS), true)
LOCAL_CFLAGS += -DUSES_CAMERA_SOLUTION_VDIS
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/converter/libs/libVDIS
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/converter/libs/libVDIS
LOCAL_SRC_FILES += \
../../exynos/libcamera3/common_v2/PlugIn/converter/libs/libVDIS/ExynosCameraPlugInConverterVDIS.cpp
endif
diff --git a/libcamera3/common_v2/PlugIn/libs/libFakeFusion/Android.mk b/libcamera3/common_v2/PlugIn/libs/libFakeFusion/Android.mk
index 6557310..450ec11 100644
--- a/libcamera3/common_v2/PlugIn/libs/libFakeFusion/Android.mk
+++ b/libcamera3/common_v2/PlugIn/libs/libFakeFusion/Android.mk
@@ -36,12 +36,12 @@
LOCAL_MODULE := libexynoscamera_fakefusion_plugin
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/ \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/ \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/libs/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/libs/libFakeFusion/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/ \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/ \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/libs/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/libs/libFakeFusion/include
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-error=date-time
diff --git a/libcamera3/common_v2/PlugIn/libs/libFakeFusion/src/Android.mk b/libcamera3/common_v2/PlugIn/libs/libFakeFusion/src/Android.mk
index 2c52861..6c1317e 100644
--- a/libcamera3/common_v2/PlugIn/libs/libFakeFusion/src/Android.mk
+++ b/libcamera3/common_v2/PlugIn/libs/libFakeFusion/src/Android.mk
@@ -9,8 +9,8 @@
LOCAL_MODULE := libexynoscamera_fakefusion
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
$(LOCAL_PATH)/../include \
LOCAL_CFLAGS := -Wno-unused-parameter
diff --git a/libcamera3/common_v2/PlugIn/libs/libLLS/Android.mk b/libcamera3/common_v2/PlugIn/libs/libLLS/Android.mk
index 2d84f4b..0067e1c 100644
--- a/libcamera3/common_v2/PlugIn/libs/libLLS/Android.mk
+++ b/libcamera3/common_v2/PlugIn/libs/libLLS/Android.mk
@@ -14,7 +14,7 @@
LOCAL_PRELINK_MODULE := true
LOCAL_PREBUILT_LIBS := lib32/liblowlightshot.so
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_MULTI_PREBUILT)
else
@@ -29,7 +29,7 @@
LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) := lib32/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_MULTILIB := both
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_PREBUILT)
endif
@@ -43,17 +43,17 @@
LOCAL_C_INCLUDES += \
$(TOP)/system/core/libcutils/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/ \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/ \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/libs/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/libs/libLLS/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/ \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/ \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/libs/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/libs/libLLS/include
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-error=date-time
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
# build sources to make builtin lowlightshow lib
diff --git a/libcamera3/common_v2/PlugIn/libs/libLLS/src/Android.mk b/libcamera3/common_v2/PlugIn/libs/libLLS/src/Android.mk
index 04fbb24..7e336f7 100644
--- a/libcamera3/common_v2/PlugIn/libs/libLLS/src/Android.mk
+++ b/libcamera3/common_v2/PlugIn/libs/libLLS/src/Android.mk
@@ -10,14 +10,14 @@
LOCAL_MODULE := liblowlightshot
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/9810 \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/9810 \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common/PlugIn/include \
$(LOCAL_PATH)/../include \
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-error=date-time
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/libcamera3/common_v2/PlugIn/libs/libVDIS/Android.mk b/libcamera3/common_v2/PlugIn/libs/libVDIS/Android.mk
index 9829ffb..6079d1b 100644
--- a/libcamera3/common_v2/PlugIn/libs/libVDIS/Android.mk
+++ b/libcamera3/common_v2/PlugIn/libs/libVDIS/Android.mk
@@ -14,7 +14,7 @@
LOCAL_PRELINK_MODULE := true
LOCAL_PREBUILT_LIBS := lib32/libvdis.so
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_MULTI_PREBUILT)
else
@@ -29,7 +29,7 @@
LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) := lib32/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_MULTILIB := both
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_PREBUILT)
endif
@@ -43,17 +43,17 @@
LOCAL_C_INCLUDES += \
$(TOP)/system/core/libcutils/include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/ \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/ \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/libs/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/libs/libVDIS/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/ \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/ \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/libs/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/libs/libVDIS/include
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-error=date-time
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
# build sources to make builtin vdis lib
diff --git a/libcamera3/common_v2/PlugIn/libs/libVDIS/src/Android.mk b/libcamera3/common_v2/PlugIn/libs/libVDIS/src/Android.mk
index e4adfeb..ed926d6 100644
--- a/libcamera3/common_v2/PlugIn/libs/libVDIS/src/Android.mk
+++ b/libcamera3/common_v2/PlugIn/libs/libVDIS/src/Android.mk
@@ -9,13 +9,13 @@
LOCAL_MODULE := libvdis
LOCAL_C_INCLUDES += \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/9xxx \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera3/common_v2/PlugIn/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/9xxx \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera3/common_v2/PlugIn/include \
$(LOCAL_PATH)/../include \
LOCAL_CFLAGS := -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-error=date-time
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/libcamera_external/Android.mk b/libcamera_external/Android.mk
index 9f80655..d6c7425 100644
--- a/libcamera_external/Android.mk
+++ b/libcamera_external/Android.mk
@@ -21,12 +21,12 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/include \
- $(TOP)/hardware/samsung_slsi/exynos/libcamera_external \
- $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
- $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
- $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libcamera \
- $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libcamera_external \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libcamera_external \
+ $(TOP)/hardware/samsung_slsi-linaro/$(TARGET_BOARD_PLATFORM)/include \
+ $(TOP)/hardware/samsung_slsi-linaro/$(TARGET_SOC)/include \
+ $(TOP)/hardware/samsung_slsi-linaro/$(TARGET_SOC)/libcamera \
+ $(TOP)/hardware/samsung_slsi-linaro/$(TARGET_SOC)/libcamera_external \
frameworks/native/include \
system/media/camera/include
diff --git a/libcsc/Android.mk b/libcsc/Android.mk
index 14c0fcc..daa315b 100644
--- a/libcsc/Android.mk
+++ b/libcsc/Android.mk
@@ -10,7 +10,7 @@
csc.c
LOCAL_C_INCLUDES := \
- hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
+ hardware/samsung_slsi-linaro/$(TARGET_BOARD_PLATFORM)/include \
$(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../libexynosutils
@@ -41,5 +41,5 @@
LOCAL_CFLAGS += -Wno-unused-variable -Wno-unused-label
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/libexynosgraphicbuffer/Android.bp b/libexynosgraphicbuffer/Android.bp
index 6ab3800..adca092 100644
--- a/libexynosgraphicbuffer/Android.bp
+++ b/libexynosgraphicbuffer/Android.bp
@@ -63,8 +63,8 @@
gralloc_version: {
three: {
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
- "hardware/samsung_slsi/exynos/gralloc3/src",
+ "hardware/samsung_slsi-linaro/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/gralloc3/src",
],
srcs: [
@@ -73,8 +73,8 @@
},
four: {
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
- "hardware/samsung_slsi/exynos/gralloc4/src",
+ "hardware/samsung_slsi-linaro/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/gralloc4/src",
],
srcs: [
@@ -83,8 +83,8 @@
},
four_sgr: {
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
- "hardware/samsung_slsi/sgpu/sgpu_gralloc/src/interface",
+ "hardware/samsung_slsi-linaro/exynos/include",
+ "hardware/samsung_slsi-linaro/sgpu/sgpu_gralloc/src/interface",
],
srcs: [
diff --git a/libexynosgraphicbuffer/gralloc3/README.txt b/libexynosgraphicbuffer/gralloc3/README.txt
index 4e8b684..8b0721b 100644
--- a/libexynosgraphicbuffer/gralloc3/README.txt
+++ b/libexynosgraphicbuffer/gralloc3/README.txt
@@ -9,11 +9,11 @@
#include <ExynosGraphicBuffer.h>
Location of header:
-/hardware/samsung_slsi/exynos/include
+/hardware/samsung_slsi-linaro/exynos/include
Location of source code:
-/hardware/samsung_slsi/exynos/gralloc3/libexynosgraphicbuffer
-/hardware/samsung_slsi/exynos/gralloc4/libexynosgraphicbuffer (will be added with gralloc4)
+/hardware/samsung_slsi-linaro/exynos/gralloc3/libexynosgraphicbuffer
+/hardware/samsung_slsi-linaro/exynos/gralloc4/libexynosgraphicbuffer (will be added with gralloc4)
diff --git a/libexynosgraphicbuffer/gralloc3/drmutils/Android.bp b/libexynosgraphicbuffer/gralloc3/drmutils/Android.bp
index 83490fd..83556ac 100644
--- a/libexynosgraphicbuffer/gralloc3/drmutils/Android.bp
+++ b/libexynosgraphicbuffer/gralloc3/drmutils/Android.bp
@@ -35,7 +35,7 @@
],
include_dirs: [
".",
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
export_include_dirs: [
".",
diff --git a/libexynosgraphicbuffer/gralloc4/README.txt b/libexynosgraphicbuffer/gralloc4/README.txt
index 4e8b684..8b0721b 100644
--- a/libexynosgraphicbuffer/gralloc4/README.txt
+++ b/libexynosgraphicbuffer/gralloc4/README.txt
@@ -9,11 +9,11 @@
#include <ExynosGraphicBuffer.h>
Location of header:
-/hardware/samsung_slsi/exynos/include
+/hardware/samsung_slsi-linaro/exynos/include
Location of source code:
-/hardware/samsung_slsi/exynos/gralloc3/libexynosgraphicbuffer
-/hardware/samsung_slsi/exynos/gralloc4/libexynosgraphicbuffer (will be added with gralloc4)
+/hardware/samsung_slsi-linaro/exynos/gralloc3/libexynosgraphicbuffer
+/hardware/samsung_slsi-linaro/exynos/gralloc4/libexynosgraphicbuffer (will be added with gralloc4)
diff --git a/libexynosutils/Android.mk b/libexynosutils/Android.mk
index 1825781..a889703 100644
--- a/libexynosutils/Android.mk
+++ b/libexynosutils/Android.mk
@@ -36,5 +36,5 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/libsbwchelper/Android.bp b/libsbwchelper/Android.bp
index 223e0b1..93970ca 100644
--- a/libsbwchelper/Android.bp
+++ b/libsbwchelper/Android.bp
@@ -21,7 +21,7 @@
proprietary: true,
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
static_libs: [
diff --git a/libsbwchelper/tests/Android.bp b/libsbwchelper/tests/Android.bp
index af13370..0297b63 100644
--- a/libsbwchelper/tests/Android.bp
+++ b/libsbwchelper/tests/Android.bp
@@ -25,7 +25,7 @@
],
include_dirs: [
- "hardware/samsung_slsi/exynos/include",
+ "hardware/samsung_slsi-linaro/exynos/include",
],
static_libs:[
diff --git a/libswconverter/Android.mk b/libswconverter/Android.mk
index cc98ad3..93c9faa 100644
--- a/libswconverter/Android.mk
+++ b/libswconverter/Android.mk
@@ -36,7 +36,7 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/include
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/include
LOCAL_MODULE := libswconverter
diff --git a/libv4l2/Android.mk b/libv4l2/Android.mk
index 01ab1d0..de027db 100644
--- a/libv4l2/Android.mk
+++ b/libv4l2/Android.mk
@@ -22,7 +22,7 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
- $(TOP)/hardware/samsung_slsi/exynos/libexynosutils
+ $(TOP)/hardware/samsung_slsi-linaro/exynos/libexynosutils
LOCAL_SHARED_LIBRARIES := \
liblog \
@@ -35,5 +35,5 @@
LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
-include $(TOP)/hardware/samsung_slsi/exynos/BoardConfigCFlags.mk
+include $(TOP)/hardware/samsung_slsi-linaro/exynos/BoardConfigCFlags.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/ssp/Android.bp b/ssp/Android.bp
index 08185bc..8efda31 100644
--- a/ssp/Android.bp
+++ b/ssp/Android.bp
@@ -1,8 +1,8 @@
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/ssp/strongbox_keymaster/Android.bp b/ssp/strongbox_keymaster/Android.bp
index db00513..cbcddcb 100644
--- a/ssp/strongbox_keymaster/Android.bp
+++ b/ssp/strongbox_keymaster/Android.bp
@@ -15,9 +15,9 @@
//
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/ssp/strongbox_keymint/Android.bp b/ssp/strongbox_keymint/Android.bp
index 7507131..dea3219 100644
--- a/ssp/strongbox_keymint/Android.bp
+++ b/ssp/strongbox_keymint/Android.bp
@@ -15,9 +15,9 @@
//
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/ssp/wait_for_dual_keymaster/Android.bp b/ssp/wait_for_dual_keymaster/Android.bp
index 3a6a3e3..da10fdb 100644
--- a/ssp/wait_for_dual_keymaster/Android.bp
+++ b/ssp/wait_for_dual_keymaster/Android.bp
@@ -14,9 +14,9 @@
// limitations under the License.
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/ssp/wait_for_dual_keymint/Android.bp b/ssp/wait_for_dual_keymint/Android.bp
index 6d928cf..6b745b5 100644
--- a/ssp/wait_for_dual_keymint/Android.bp
+++ b/ssp/wait_for_dual_keymint/Android.bp
@@ -14,9 +14,9 @@
// limitations under the License.
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/tee/TlcKeymint/Android.bp b/tee/TlcKeymint/Android.bp
index dda3d04..6442389 100644
--- a/tee/TlcKeymint/Android.bp
+++ b/tee/TlcKeymint/Android.bp
@@ -29,9 +29,9 @@
// See: http://go/android-license-faq
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/tee/TlcTeeKeymaster4/Android.bp b/tee/TlcTeeKeymaster4/Android.bp
index 6b5eaa0..ec824a0 100644
--- a/tee/TlcTeeKeymaster4/Android.bp
+++ b/tee/TlcTeeKeymaster4/Android.bp
@@ -15,9 +15,9 @@
//
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}
diff --git a/tee/kinibi500/system/TeeService/Android.bp b/tee/kinibi500/system/TeeService/Android.bp
index 5841ae6..0396fa5 100644
--- a/tee/kinibi500/system/TeeService/Android.bp
+++ b/tee/kinibi500/system/TeeService/Android.bp
@@ -49,8 +49,8 @@
],
include_dirs: [
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include",
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
],
}
@@ -83,8 +83,8 @@
],
include_dirs: [
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include",
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
],
export_include_dirs: [
diff --git a/tee/kinibi500/system/TeeServiceJava/Android.bp b/tee/kinibi500/system/TeeServiceJava/Android.bp
index d93e7d2..4e79540 100644
--- a/tee/kinibi500/system/TeeServiceJava/Android.bp
+++ b/tee/kinibi500/system/TeeServiceJava/Android.bp
@@ -9,8 +9,8 @@
],
include_dirs: [
- "hardware/samsung_slsi/exynos/tee/kinibi500/system/TeeService",
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/system/TeeService",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default",
],
// Undefine NDEBUG to enable LOG_D in log
diff --git a/tee/kinibi500/vendor/hardware/interfaces/Android.bp b/tee/kinibi500/vendor/hardware/interfaces/Android.bp
index ee9eb16..29d694d 100644
--- a/tee/kinibi500/vendor/hardware/interfaces/Android.bp
+++ b/tee/kinibi500/vendor/hardware/interfaces/Android.bp
@@ -1,4 +1,4 @@
hidl_package_root {
name: "vendor.trustonic",
- path: "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/hardware/interfaces",
+ path: "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/hardware/interfaces",
}
diff --git a/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default/Android.bp b/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default/Android.bp
index a95ac00..2f424cf 100644
--- a/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default/Android.bp
+++ b/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default/Android.bp
@@ -20,8 +20,8 @@
],
include_dirs: [
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include",
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
"system/memory/libion/kernel-headers",
],
@@ -61,8 +61,8 @@
],
include_dirs: [
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include",
- "hardware/samsung_slsi/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/ClientLib/include/GP",
],
cflags: [
diff --git a/tee/kinibi510/vendor/hardware/interfaces/Android.bp b/tee/kinibi510/vendor/hardware/interfaces/Android.bp
index 13c5f0b..b09c2e9 100644
--- a/tee/kinibi510/vendor/hardware/interfaces/Android.bp
+++ b/tee/kinibi510/vendor/hardware/interfaces/Android.bp
@@ -1,5 +1,5 @@
hidl_package_root {
name: "vendor.trustonic",
/* ExySp */
- path: "hardware/samsung_slsi/exynos/tee/kinibi510/vendor/hardware/interfaces",
+ path: "hardware/samsung_slsi-linaro/exynos/tee/kinibi510/vendor/hardware/interfaces",
}
diff --git a/tee/kinibi520/vendor/hardware/interfaces/Android.bp b/tee/kinibi520/vendor/hardware/interfaces/Android.bp
index 60a5372..7f50379 100644
--- a/tee/kinibi520/vendor/hardware/interfaces/Android.bp
+++ b/tee/kinibi520/vendor/hardware/interfaces/Android.bp
@@ -1,5 +1,5 @@
hidl_package_root {
name: "vendor.trustonic",
/* ExySp */
- path: "hardware/samsung_slsi/exynos/tee/kinibi520/vendor/hardware/interfaces",
+ path: "hardware/samsung_slsi-linaro/exynos/tee/kinibi520/vendor/hardware/interfaces",
}
diff --git a/usb/Android.bp b/usb/Android.bp
index 9828d4e..5358ff1 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -46,7 +46,7 @@
},
default: {
include_dirs: [
- "hardware/samsung_slsi/exynos/usb/default",
+ "hardware/samsung_slsi-linaro/exynos/usb/default",
],
},
},
diff --git a/weaver/Android.bp b/weaver/Android.bp
index f13c1e3..cec61d2 100644
--- a/weaver/Android.bp
+++ b/weaver/Android.bp
@@ -1,8 +1,8 @@
soong_namespace {
imports: [
- "hardware/samsung_slsi/exynos/tee/kinibi520",
- "hardware/samsung_slsi/exynos/tee/kinibi510",
- "hardware/samsung_slsi/exynos/tee/kinibi500"
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
+ "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
],
}