sm6250-common: partial conversion to sm8350

This commit is contained in:
Cosmin Tanislav 2021-08-29 12:22:31 +03:00
parent 554eb8b0ac
commit 1649671922
19 changed files with 32 additions and 32 deletions

View File

@ -6,7 +6,7 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter curtana excalibur gram joyeuse miatoll,$(TARGET_DEVICE)),) ifneq ($(filter venus,$(TARGET_DEVICE)),)
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))
include $(CLEAR_VARS) include $(CLEAR_VARS)

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
COMMON_PATH := device/xiaomi/sm6250-common COMMON_PATH := device/xiaomi/sm8350-common
BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_DUP_RULES := true
@ -86,7 +86,7 @@ KERNEL_LD := LD=ld.lld
TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_ARCH := arm64
TARGET_KERNEL_CLANG_COMPILE := true TARGET_KERNEL_CLANG_COMPILE := true
TARGET_KERNEL_CONFIG := cust_defconfig TARGET_KERNEL_CONFIG := cust_defconfig
TARGET_KERNEL_SOURCE := kernel/xiaomi/sm6250 TARGET_KERNEL_SOURCE := kernel/xiaomi/sm8350
BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0 BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0
BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom
@ -109,8 +109,8 @@ DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
# Init # Init
TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm6250 TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm8350
TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm6250 TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm8350
# Media # Media
TARGET_USES_ION := true TARGET_USES_ION := true
@ -226,4 +226,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
WPA_SUPPLICANT_VERSION := VER_0_8_X WPA_SUPPLICANT_VERSION := VER_0_8_X
# Inherit proprietary blobs # Inherit proprietary blobs
-include vendor/xiaomi/sm6250-common/BoardConfigVendor.mk -include vendor/xiaomi/sm8350-common/BoardConfigVendor.mk

View File

@ -1,4 +1,4 @@
Copyright (C) 2020 - The LineageOS Project Copyright (C) 2020 - The LineageOS Project
Common device tree for Xiaomi SM6250 based devices Common device tree for Xiaomi SM8350 based devices
============== ==============

View File

@ -8,7 +8,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit proprietary targets # Inherit proprietary targets
$(call inherit-product-if-exists, vendor/xiaomi/sm6250-common/sm6250-common-vendor.mk) $(call inherit-product-if-exists, vendor/xiaomi/sm8350-common/sm8350-common-vendor.mk)
# Enable updating of APEXes # Enable updating of APEXes
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
@ -152,7 +152,7 @@ PRODUCT_PACKAGES += \
# Fingerprint # Fingerprint
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250 android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
@ -231,7 +231,7 @@ PRODUCT_COPY_FILES += \
# Light # Light
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.light@2.0-service.xiaomi_sm6250 android.hardware.light@2.0-service.xiaomi_sm8350
# LiveDisplay # LiveDisplay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -278,7 +278,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
# Power # Power
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.power@1.3-service.xiaomi_sm6250 android.hardware.power@1.3-service.xiaomi_sm8350
# RCS # RCS
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View File

@ -14,10 +14,10 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250", name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350",
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc"], init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc"],
srcs: ["service.cpp", "BiometricsFingerprint.cpp"], srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
shared_libs: [ shared_libs: [
"libbase", "libbase",

View File

@ -17,7 +17,7 @@
#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250" #define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350"
#include <android/log.h> #include <android/log.h>
#include <cutils/properties.h> #include <cutils/properties.h>

View File

@ -1,4 +1,4 @@
service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250 service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350
class late_start class late_start
user system user system
group system input uhid group system input uhid

View File

@ -15,7 +15,7 @@
// //
cc_library_static { cc_library_static {
name: "libinit_xiaomi_sm6250_common", name: "libinit_xiaomi_sm8350_common",
recovery_available: true, recovery_available: true,
srcs: [ srcs: [
"init_common.cpp" "init_common.cpp"
@ -33,12 +33,12 @@ cc_library_static {
} }
cc_library_static { cc_library_static {
name: "libinit_xiaomi_sm6250", name: "libinit_xiaomi_sm8350",
recovery_available: true, recovery_available: true,
srcs: [ srcs: [
"init.cpp" "init.cpp"
], ],
whole_static_libs: [ whole_static_libs: [
"libinit_xiaomi_sm6250_common" "libinit_xiaomi_sm8350_common"
] ]
} }

View File

@ -15,8 +15,8 @@
cc_binary { cc_binary {
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
name: "android.hardware.light@2.0-service.xiaomi_sm6250", name: "android.hardware.light@2.0-service.xiaomi_sm8350",
init_rc: ["android.hardware.light@2.0-service.xiaomi_sm6250.rc"], init_rc: ["android.hardware.light@2.0-service.xiaomi_sm8350.rc"],
srcs: ["service.cpp", "Light.cpp"], srcs: ["service.cpp", "Light.cpp"],
vendor: true, vendor: true,
shared_libs: [ shared_libs: [

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6250" #define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm8350"
#include <log/log.h> #include <log/log.h>

View File

@ -8,7 +8,7 @@ on boot
chmod 0644 /sys/class/leds/white/brightness chmod 0644 /sys/class/leds/white/brightness
chmod 0644 /sys/class/leds/white/breath chmod 0644 /sys/class/leds/white/breath
service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm6250 service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm8350
interface android.hardware.light@2.0::ILight default interface android.hardware.light@2.0::ILight default
class hal class hal
user system user system

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6250" #define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm8350"
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>

View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "android.hardware.power@1.3-service.xiaomi_sm6250", name: "android.hardware.power@1.3-service.xiaomi_sm8350",
init_rc: ["android.hardware.power@1.3-service.xiaomi_sm6250.rc"], init_rc: ["android.hardware.power@1.3-service.xiaomi_sm8350.rc"],
relative_install_path: "hw", relative_install_path: "hw",
proprietary: true, proprietary: true,
srcs: [ srcs: [

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm6250" #define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm8350"
#include <linux/input.h> #include <linux/input.h>

View File

@ -1,4 +1,4 @@
service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.3-service.xiaomi_sm6250 service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.3-service.xiaomi_sm8350
class hal class hal
user system user system
group system input group system input

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm6250" #define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm8350"
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>

View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.networkstack.tethering.xiaomi_sm6250" package="com.android.networkstack.tethering.xiaomi_sm8350"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<application android:hasCode="false" /> <application android:hasCode="false" />

View File

@ -15,7 +15,7 @@
--> -->
<!-- Pixel specific wifi overlays --> <!-- Pixel specific wifi overlays -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.wifi.resources.xiaomi_sm6250" package="com.android.wifi.resources.xiaomi_sm8350"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<application android:hasCode="false" /> <application android:hasCode="false" />

View File

@ -4,7 +4,7 @@
/mnt/vendor/persist/subsys(/.*)? u:object_r:persist_subsys_file:s0 /mnt/vendor/persist/subsys(/.*)? u:object_r:persist_subsys_file:s0
# Fingerprint # Fingerprint
/vendor/bin/hw/android\.hardware\.fingerprint@2\.1-service\.xiaomi_sm6250 u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.fingerprint@2\.1-service\.xiaomi_sm8350 u:object_r:hal_fingerprint_default_exec:s0
# Power HAL # Power HAL
/vendor/bin/hw/android\.hardware\.power@1\.3-service\.xiaomi_sm6250 u:object_r:hal_power_default_exec:s0 /vendor/bin/hw/android\.hardware\.power@1\.3-service\.xiaomi_sm8350 u:object_r:hal_power_default_exec:s0