sdm845-common -> sm8250-common

This commit is contained in:
LuK1337 2020-06-22 10:35:37 +02:00
parent ebe358dcbf
commit 98a0defd38
24 changed files with 153 additions and 127 deletions

View file

@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter enchilada fajita,$(TARGET_DEVICE)),) ifneq ($(filter instantnoodle instantnoodlep,$(TARGET_DEVICE)),)
subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
endif endif

View file

@ -16,7 +16,7 @@
BOARD_VENDOR := oneplus BOARD_VENDOR := oneplus
COMMON_PATH := device/oneplus/sdm845-common COMMON_PATH := device/oneplus/sm8250-common
TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include
@ -38,25 +38,26 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
# Bootloader # Bootloader
TARGET_BOOTLOADER_BOARD_NAME := sdm845 TARGET_BOOTLOADER_BOARD_NAME := kona
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
# Kernel # Kernel
BOARD_KERNEL_BASE := 0x80000000 BOARD_KERNEL_BASE := 0x80000000
BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 swiotlb=2048 androidboot.configfs=true androidboot.usbcontroller=a600000.dwc3 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=2048 loop.max_part=7 cgroup.memory=nokmem,nosocket reboot=panic_warm
BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_SEPARATED_DTBO := true BOARD_KERNEL_SEPARATED_DTBO := true
NEED_KERNEL_MODULE_SYSTEM := true NEED_KERNEL_MODULE_SYSTEM := true
TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_ARCH := arm64
TARGET_KERNEL_SOURCE := kernel/oneplus/sdm845 TARGET_KERNEL_SOURCE := kernel/oneplus/sm8250
TARGET_KERNEL_CLANG_COMPILE := true TARGET_KERNEL_CLANG_COMPILE := true
TARGET_KERNEL_CONFIG := vendor/kona-perf_defconfig
# Platform # Platform
BOARD_USES_QCOM_HARDWARE := true BOARD_USES_QCOM_HARDWARE := true
BUILD_WITHOUT_VENDOR := true BUILD_WITHOUT_VENDOR := true
TARGET_BOARD_PLATFORM := sdm845 TARGET_BOARD_PLATFORM := kona
TARGET_BOARD_PLATFORM_GPU := qcom-adreno630 TARGET_BOARD_PLATFORM_GPU := qcom-adreno650
# Properties # Properties
TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
@ -97,18 +98,27 @@ TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
# HIDL # HIDL
DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
# Metadata
BOARD_USES_METADATA_PARTITION := true
# Partitions # Partitions
BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
BOARD_DTBOIMG_PARTITION_SIZE := 8388608 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296
BOARD_USERDATAIMAGE_PARTITION_SIZE := 118112366592 BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_ONEPLUS_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system
BOARD_ONEPLUS_DYNAMIC_PARTITIONS_SIZE := 7511998464
BOARD_SUPER_PARTITION_GROUPS := oneplus_dynamic_partitions
BOARD_SUPER_PARTITION_SIZE := 15032385536
BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
TARGET_COPY_OUT_ODM := odm
TARGET_COPY_OUT_PRODUCT := product
TARGET_COPY_OUT_VENDOR := vendor TARGET_COPY_OUT_VENDOR := vendor
# Recovery # Recovery
BOARD_USES_RECOVERY_AS_BOOT := true
TARGET_NO_RECOVERY := true
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_EXT4 := true
@ -134,7 +144,13 @@ BOARD_PLAT_PUBLIC_SEPOLICY_DIR += \
# Verified Boot # Verified Boot
BOARD_AVB_ENABLE := true BOARD_AVB_ENABLE := true
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
BOARD_AVB_VBMETA_SYSTEM := system
BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
# Inherit from the proprietary version # Inherit from the proprietary version
-include vendor/oneplus/sdm845-common/BoardConfigVendor.mk -include vendor/oneplus/sm8250-common/BoardConfigVendor.mk

View file

@ -15,7 +15,7 @@
// //
cc_library { cc_library {
name: "bootctrl.sdm845", name: "bootctrl.kona",
defaults: ["bootctrl_hal_defaults"], defaults: ["bootctrl_hal_defaults"],
static_libs: ["libgptutils.oneplus_sdm845"], static_libs: ["libgptutils.oneplus_kona"],
} }

View file

@ -18,7 +18,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
# Get non-open-source specific aspects # Get non-open-source specific aspects
$(call inherit-product, vendor/oneplus/sdm845-common/sdm845-common-vendor.mk) $(call inherit-product, vendor/oneplus/sm8250-common/sm8250-common-vendor.mk)
# Overlays # Overlays
DEVICE_PACKAGE_OVERLAYS += \ DEVICE_PACKAGE_OVERLAYS += \
@ -49,8 +49,12 @@ AB_OTA_UPDATER := true
AB_OTA_PARTITIONS += \ AB_OTA_PARTITIONS += \
boot \ boot \
dtbo \ dtbo \
odm \
product \
recovery \
system \ system \
vbmeta vbmeta \
vbmeta_system
AB_OTA_POSTINSTALL_CONFIG += \ AB_OTA_POSTINSTALL_CONFIG += \
RUN_POSTINSTALL_system=true \ RUN_POSTINSTALL_system=true \
@ -77,7 +81,7 @@ PRODUCT_COPY_FILES += \
# Boot control # Boot control
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.boot@1.0-impl.recovery \ android.hardware.boot@1.0-impl.recovery \
bootctrl.sdm845.recovery bootctrl.kona.recovery
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
bootctl bootctl
@ -115,11 +119,11 @@ PRODUCT_COPY_FILES += \
# Lights # Lights
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.light@2.0-service.oneplus_sdm845 android.hardware.light@2.0-service.oneplus_kona
# LiveDisplay # LiveDisplay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
lineage.livedisplay@2.0-service.oneplus_sdm845 lineage.livedisplay@2.0-service.oneplus_kona
# Media # Media
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -167,7 +171,7 @@ PRODUCT_BOOT_JARS += \
# Touch # Touch
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
lineage.touch@1.0-service.oneplus_sdm845 lineage.touch@1.0-service.oneplus_kona
# tri-state-key # tri-state-key
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -196,3 +200,6 @@ PRODUCT_BOOT_JARS += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/privapp-permissions-wfd.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-wfd.xml $(LOCAL_PATH)/configs/privapp-permissions-wfd.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-wfd.xml
PRODUCT_BUILD_SUPER_PARTITION := false
PRODUCT_USE_DYNAMIC_PARTITIONS := true

View file

@ -16,7 +16,7 @@
cc_library { cc_library {
name: "libgptutils.oneplus_sdm845", name: "libgptutils.oneplus_kona",
vendor: true, vendor: true,
recovery_available: true, recovery_available: true,
shared_libs: [ shared_libs: [

View file

@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.light@2.0-service.oneplus_sdm845 LOCAL_MODULE := android.hardware.light@2.0-service.oneplus_kona
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin
@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \
Light.cpp Light.cpp
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
android.hardware.light@2.0-service.oneplus_sdm845.rc android.hardware.light@2.0-service.oneplus_kona.rc
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbase \ libbase \
@ -30,13 +30,13 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.light@2.0-service.oneplus_sdm845.rc LOCAL_MODULE := android.hardware.light@2.0-service.oneplus_kona.rc
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init
LOCAL_MODULE_STEM := android.hardware.light@2.0-service.rc LOCAL_MODULE_STEM := android.hardware.light@2.0-service.rc
LOCAL_SRC_FILES := android.hardware.light@2.0-service.oneplus_sdm845.rc LOCAL_SRC_FILES := android.hardware.light@2.0-service.oneplus_kona.rc
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)

View file

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

View file

@ -1,6 +1,6 @@
[ [
{ {
"repository": "android_kernel_oneplus_sdm845", "repository": "android_kernel_oneplus_sm8250",
"target_path": "kernel/oneplus/sdm845" "target_path": "kernel/oneplus/sm8250"
} }
] ]

View file

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "lineage.livedisplay@2.0-service.oneplus_sdm845", name: "lineage.livedisplay@2.0-service.oneplus_kona",
init_rc: ["lineage.livedisplay@2.0-service.oneplus_sdm845.rc"], init_rc: ["lineage.livedisplay@2.0-service.oneplus_kona.rc"],
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [

View file

@ -7,7 +7,7 @@ on init
on post-fs-data on post-fs-data
mkdir /data/misc/display 0770 system graphics mkdir /data/misc/display 0770 system graphics
service livedisplay-hal-2-0 /system/bin/hw/lineage.livedisplay@2.0-service.oneplus_sdm845 service livedisplay-hal-2-0 /system/bin/hw/lineage.livedisplay@2.0-service.oneplus_kona
class hal class hal
user system user system
group system group system

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "lineage.livedisplay@2.0-service.oneplus_sdm845" #define LOG_TAG "lineage.livedisplay@2.0-service.oneplus_kona"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>

View file

@ -1,50 +1,53 @@
# Copyright (c) 2018, The Linux Foundation. All rights reserved. # Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted (subject to the limitations in the
# met: # disclaimer below) provided that the following conditions are met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided
# with the distribution.
# * Neither the name of The Linux Foundation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
# #
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED # * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided
# with the distribution.
#
# * Neither the name of The Linux Foundation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS # IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR # GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Android fstab file. # Android fstab file.
# The filesystem that contains the filesystem checker binary (typically /system) cannot # The filesystem that contains the filesystem checker binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
#TODO: Add 'check' as fs_mgr_flags with data partition. #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# Currently we dont have e2fsck compiled. So fs check would failed. system /system ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
odm /odm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,sync wait,formattable,wrappedkey,first_stage_mount
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=512M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait,check
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
#/devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer
#/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer
/devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
#/dev/block/bootdevice/by-name/spunvm /mnt/vendor/spunvm vfat rw,noatime,shortname=lower,uid=1000,gid=1000,dmask=007,fmask=007,context=u:object_r:spunvm_file:s0 wait
/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt ext4 ro,context=u:object_r:firmware_file:s0 wait,slotselect
/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect,avb
/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard wait,check,fileencryption=ice,quota,reservedsize=512M
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard wait,check,fileencryption=ice,quota
#/devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer
#/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer
/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait
/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
/devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
# Need to have this entry in here even though the mount point itself is no longer needed.
# The update_engine code looks for this entry in order to determine the boot device address
# and fails if it does not find it.
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
/dev/block/zram0 none swap defaults zramsize=1073741824

View file

@ -14,9 +14,9 @@
# HALs # HALs
/(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0 /(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0
/system/bin/hw/lineage\.biometrics\.fingerprint\.inscreen@1.0-service\.oneplus_fajita u:object_r:hal_fod_sdm845_exec:s0 /system/bin/hw/lineage\.biometrics\.fingerprint\.inscreen@1.0-service\.oneplus_kona u:object_r:hal_fod_kona_exec:s0
/system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_sdm845 u:object_r:hal_livedisplay_sdm845_exec:s0 /system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_kona u:object_r:hal_livedisplay_kona_exec:s0
/system/bin/hw/lineage\.touch@1\.0-service\.oneplus_sdm845 u:object_r:hal_touch_sdm845_exec:s0 /system/bin/hw/lineage\.touch@1\.0-service\.oneplus_kona u:object_r:hal_touch_kona_exec:s0
# DASH # DASH
/system/bin/dashd u:object_r:dashd_exec:s0 /system/bin/dashd u:object_r:dashd_exec:s0

View file

@ -0,0 +1,23 @@
type hal_fod_kona, coredomain, domain;
hal_server_domain(hal_fod_kona, hal_lineage_fod)
type hal_fod_kona_exec, system_file_type, exec_type, file_type;
init_daemon_domain(hal_fod_kona)
# Allow access to the HALs
hal_client_domain(hal_fod_kona, hal_fingerprint)
# Allow binder communication with hal_display_default
binder_call(hal_fod_kona, hal_display_default)
# Allow binder communication with hal_fingerprint
binder_call(hal_fod_kona, hal_fingerprint)
# Allow hal_fod_kona to hal_display_hwservice
allow hal_fod_kona hal_display_hwservice:hwservice_manager find;
# Allow hal_fod_kona to hal_fingerprint_hwservice
allow hal_fod_kona hal_fingerprint_hwservice:hwservice_manager find;
# Allow hal_fod_kona to read and write to sysfs_fod
allow hal_fod_kona sysfs_fod:file rw_file_perms;

View file

@ -1,23 +0,0 @@
type hal_fod_sdm845, coredomain, domain;
hal_server_domain(hal_fod_sdm845, hal_lineage_fod)
type hal_fod_sdm845_exec, system_file_type, exec_type, file_type;
init_daemon_domain(hal_fod_sdm845)
# Allow access to the HALs
hal_client_domain(hal_fod_sdm845, hal_fingerprint)
# Allow binder communication with hal_display_default
binder_call(hal_fod_sdm845, hal_display_default)
# Allow binder communication with hal_fingerprint
binder_call(hal_fod_sdm845, hal_fingerprint)
# Allow hal_fod_sdm845 to hal_display_hwservice
allow hal_fod_sdm845 hal_display_hwservice:hwservice_manager find;
# Allow hal_fod_sdm845 to hal_fingerprint_hwservice
allow hal_fod_sdm845 hal_fingerprint_hwservice:hwservice_manager find;
# Allow hal_fod_sdm845 to read and write to sysfs_fod
allow hal_fod_sdm845 sysfs_fod:file rw_file_perms;

View file

@ -0,0 +1,12 @@
type hal_livedisplay_kona, coredomain, domain;
hal_server_domain(hal_livedisplay_kona, hal_lineage_livedisplay)
type hal_livedisplay_kona_exec, system_file_type, exec_type, file_type;
init_daemon_domain(hal_livedisplay_kona)
# Allow LiveDisplay to store files under /data/misc/display and access them
allow hal_livedisplay_kona display_misc_file:dir rw_dir_perms;
allow hal_livedisplay_kona display_misc_file:file create_file_perms;
# Grant access over LiveDisplay tuneables
allow hal_livedisplay_kona sysfs_livedisplay_tuneable:file rw_file_perms;

View file

@ -1,12 +0,0 @@
type hal_livedisplay_sdm845, coredomain, domain;
hal_server_domain(hal_livedisplay_sdm845, hal_lineage_livedisplay)
type hal_livedisplay_sdm845_exec, system_file_type, exec_type, file_type;
init_daemon_domain(hal_livedisplay_sdm845)
# Allow LiveDisplay to store files under /data/misc/display and access them
allow hal_livedisplay_sdm845 display_misc_file:dir rw_dir_perms;
allow hal_livedisplay_sdm845 display_misc_file:file create_file_perms;
# Grant access over LiveDisplay tuneables
allow hal_livedisplay_sdm845 sysfs_livedisplay_tuneable:file rw_file_perms;

View file

@ -0,0 +1,9 @@
type hal_touch_kona, coredomain, domain;
hal_server_domain(hal_touch_kona, hal_lineage_touch)
type hal_touch_kona_exec, system_file_type, exec_type, file_type;
init_daemon_domain(hal_touch_kona)
# Allow access to gesture enable nodes
allow hal_touch_kona proc_touchpanel:dir search;
allow hal_touch_kona proc_touchpanel:file rw_file_perms;

View file

@ -1,9 +0,0 @@
type hal_touch_sdm845, coredomain, domain;
hal_server_domain(hal_touch_sdm845, hal_lineage_touch)
type hal_touch_sdm845_exec, system_file_type, exec_type, file_type;
init_daemon_domain(hal_touch_sdm845)
# Allow access to gesture enable nodes
allow hal_touch_sdm845 proc_touchpanel:dir search;
allow hal_touch_sdm845 proc_touchpanel:file rw_file_perms;

View file

@ -34,7 +34,7 @@ source "${HELPER}"
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
# Copyright headers and guards # Copyright headers and guards
write_headers "enchilada fajita" write_headers "instantnoodle instantnoodlep"
# The standard common blobs # The standard common blobs
write_makefiles "${MY_DIR}/proprietary-files.txt" true write_makefiles "${MY_DIR}/proprietary-files.txt" true

View file

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "lineage.touch@1.0-service.oneplus_sdm845", name: "lineage.touch@1.0-service.oneplus_kona",
init_rc: ["lineage.touch@1.0-service.oneplus_sdm845.rc"], init_rc: ["lineage.touch@1.0-service.oneplus_kona.rc"],
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [

View file

@ -28,7 +28,7 @@ on boot
chown system system /proc/touchpanel/up_swipe_enable chown system system /proc/touchpanel/up_swipe_enable
chown system system /proc/touchpanel/single_tap_enable chown system system /proc/touchpanel/single_tap_enable
service touch-hal-1-0 /system/bin/hw/lineage.touch@1.0-service.oneplus_sdm845 service touch-hal-1-0 /system/bin/hw/lineage.touch@1.0-service.oneplus_kona
class hal class hal
user system user system
group system group system

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "lineage.touch@1.0-service.oneplus_sdm845" #define LOG_TAG "lineage.touch@1.0-service.oneplus_kona"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>