r8q-common -> sm8250-common

* Due to potential unlockable S20 and Tab S7 series.

Signed-off-by: ata-kaner <ata.kaner03@gmail.com>

r8q-common/Android.mk

@@ -1,9 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/samsung/r8q-common/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter r8qxx r8qxxx,$(TARGET_DEVICE)),)
-
-endif

r8q-common/BoardConfigVendor.mk

@@ -1,4 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/samsung/r8q-common/setup-makefiles.sh
-

r8q/Android.bp

@@ -0,0 +1,80 @@
+// Automatically generated file. DO NOT MODIFY
+//
+// This file is generated by device/samsung/r8q/setup-makefiles.sh
+
+soong_namespace {
+	imports: [
+		"vendor/samsung/sm8250-common",
+	],
+}
+
+cc_prebuilt_library_shared {
+	name: "android.hardware.secure_element-impl-gto",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "ese_spi_nxp",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/ese_spi_nxp.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_binary {
+	name: "android.hardware.secure_element@1.0-service",
+	owner: "samsung",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	relative_install_path: "hw",
+	soc_specific: true,
+}
+
+cc_prebuilt_binary {
+	name: "android.hardware.secure_element@1.0-service-gto",
+	owner: "samsung",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service-gto"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	relative_install_path: "hw",
+	soc_specific: true,
+}
+

r8q/Android.mk

@@ -0,0 +1,9 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/samsung/r8q/setup-makefiles.sh
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),r8q)
+
+endif

r8q/BoardConfigVendor.mk

@@ -0,0 +1,4 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/samsung/r8q/setup-makefiles.sh
+

r8q/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc

@@ -0,0 +1,8 @@
+service vendor.secure_element_hal_service-gto /vendor/bin/hw/android.hardware.secure_element@1.0-service-gto
+    class hal
+    disabled
+    user system
+    group system
+    
+on property:ro.boot.hardware.sku=s3fwrn5
+    start vendor.secure_element_hal_service-gto

r8q/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc

@@ -0,0 +1,8 @@
+service vendor.secure_element_hal_service /vendor/bin/hw/android.hardware.secure_element@1.0-service
+    class hal
+    disabled
+    user system
+    group system
+    
+on property:ro.boot.hardware.sku=sn110t
+    start vendor.secure_element_hal_service

r8q/r8q-vendor.mk

@@ -0,0 +1,19 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/samsung/r8q/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/samsung/r8q
+
+PRODUCT_COPY_FILES += \
+    vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.0-service-gto-sku.rc \
+    vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.secure_element@1.0-service-sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.0-service-sku.rc \
+    vendor/samsung/r8q/proprietary/vendor/etc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf \
+    vendor/samsung/r8q/proprietary/vendor/etc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
+    vendor/samsung/r8q/proprietary/vendor/firmware/nfc/libsn100u_fw.so:$(TARGET_COPY_OUT_VENDOR)/firmware/nfc/libsn100u_fw.so
+
+PRODUCT_PACKAGES += \
+    android.hardware.secure_element-impl-gto \
+    ese_spi_nxp \
+    android.hardware.secure_element@1.0-service \
+    android.hardware.secure_element@1.0-service-gto

r8qxx/Android.bp

@@ -1,45 +0,0 @@
-// Automatically generated file. DO NOT MODIFY
-//
-// This file is generated by device/samsung/r8qxx/setup-makefiles.sh
-
-soong_namespace {
-	imports: [
-		"vendor/samsung/r8q-common",
-	],
-}
-
-cc_prebuilt_library_shared {
-	name: "ese_spi_nxp",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/ese_spi_nxp.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_binary {
-	name: "android.hardware.secure_element@1.0-service",
-	owner: "samsung",
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.0-service"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	strip: {
-		none: true,
-	},
-	prefer: true,
-	relative_install_path: "hw",
-	soc_specific: true,
-}
-

r8qxx/Android.mk

@@ -1,9 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/samsung/r8qxx/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),r8qxx)
-
-endif

r8qxx/BoardConfigVendor.mk

@@ -1,4 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/samsung/r8qxx/setup-makefiles.sh
-

r8qxx/r8qxx-vendor.mk

@@ -1,14 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/samsung/r8qxx/setup-makefiles.sh
-
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/samsung/r8qxx
-
-PRODUCT_COPY_FILES += \
-    vendor/samsung/r8qxx/proprietary/vendor/etc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf \
-    vendor/samsung/r8qxx/proprietary/vendor/firmware/nfc/libsn100u_fw.so:$(TARGET_COPY_OUT_VENDOR)/firmware/nfc/libsn100u_fw.so
-
-PRODUCT_PACKAGES += \
-    ese_spi_nxp \
-    android.hardware.secure_element@1.0-service

sm8250-common/Android.bp

@@ -1,6 +1,6 @@
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/samsung/r8q-common/setup-makefiles.sh
+// This file is generated by device/samsung/sm8250-common/setup-makefiles.sh
 
 soong_namespace {
 	imports: [
@@ -47,23 +47,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "android.hardware.secure_element-impl-gto",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libkeymaster_helper",
 	owner: "samsung",
@@ -239,12 +222,3 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
-sh_binary {
-	name: "android.hardware.secure_element@1.2-service",
-	owner: "samsung",
-	src: "proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service",
-	filename: "android.hardware.secure_element@1.2-service",
-	sub_dir: "hw",
-	soc_specific: true,
-}
-

sm8250-common/Android.mk

@@ -0,0 +1,9 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/samsung/sm8250-common/setup-makefiles.sh
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter r8q,$(TARGET_DEVICE)),)
+
+endif

sm8250-common/BoardConfigVendor.mk

@@ -0,0 +1,4 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/samsung/sm8250-common/setup-makefiles.sh
+