diff --git a/Android.mk b/Android.mk index 55edc80..7f27953 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),pstar) +ifeq ($(TARGET_DEVICE),berlin) include $(call all-makefiles-under,$(LOCAL_PATH)) endif \ No newline at end of file diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 676a5bb..3b6d331 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_pstar.mk + $(LOCAL_DIR)/lineage_berlin.mk COMMON_LUNCH_CHOICES := \ - lineage_pstar-user \ - lineage_pstar-userdebug \ - lineage_pstar-eng \ No newline at end of file + lineage_berlin-user \ + lineage_berlin-userdebug \ + lineage_berlin-eng \ No newline at end of file diff --git a/BoardConfig.mk b/BoardConfig.mk index 15b5cb1..b9db2b5 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,13 +14,13 @@ # limitations under the License. # -DEVICE_PATH := device/motorola/pstar +DEVICE_PATH := device/motorola/berlin -# Inherit from motorola sm8250-common --include device/motorola/sm8250-common/BoardConfigCommon.mk +# Inherit from motorola sm7325-common +-include device/motorola/sm7325-common/BoardConfigCommon.mk # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := pstar +TARGET_BOOTLOADER_BOARD_NAME := berlin # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth @@ -29,7 +29,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml # Kernel -TARGET_KERNEL_CONFIG += vendor/lineage_pstar.config +TARGET_KERNEL_CONFIG += vendor/lineage_berlin.config # Partitions BOARD_USERDATAIMAGE_PARTITION_SIZE := 226517168128 @@ -55,4 +55,4 @@ TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 VENDOR_SECURITY_PATCH := 2021-12-01 # inherit from the proprietary version --include vendor/motorola/pstar/BoardConfigVendor.mk +-include vendor/motorola/berlin/BoardConfigVendor.mk diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index 4998937..a41ec90 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -22,7 +22,7 @@ #ifndef _BDROID_BUILDCFG_H #define _BDROID_BUILDCFG_H -#define BTM_DEF_LOCAL_NAME "Moto Edge 20 Pro" +#define BTM_DEF_LOCAL_NAME "Motorola Edge 20" // Disables read remote device feature #define MAX_ACL_CONNECTIONS 16 #define MAX_L2CAP_CHANNELS 16 diff --git a/device.mk b/device.mk index 684c8f7..da4e4f7 100644 --- a/device.mk +++ b/device.mk @@ -28,13 +28,13 @@ PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi PRODUCT_SHIPPING_API_LEVEL := 30 -# Inherit from motorola sm8250-common -$(call inherit-product, device/motorola/sm8250-common/sm8250.mk) +# Inherit from motorola sm7325-common +$(call inherit-product, device/motorola/sm7325-common/sm7325.mk) # Overlay PRODUCT_PACKAGES += \ - FrameworksResPstar \ - SystemUIResPstar + FrameworksResBerlin \ + SystemUIResBerlin # Audio PRODUCT_COPY_FILES += \ @@ -60,7 +60,7 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ # Lineage Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.pstar + vendor.lineage.touch@1.0-service.berlin # Media PRODUCT_COPY_FILES += \ @@ -85,4 +85,4 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/pstar/pstar-vendor.mk) +$(call inherit-product, vendor/motorola/berlin/berlin-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 1eee7b3..3dab39d 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,8 +14,8 @@ fi set -e -export DEVICE=pstar -export DEVICE_COMMON=sm8250-common +export DEVICE=berlin +export DEVICE_COMMON=sm7325-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/lineage_pstar.mk b/lineage_berlin.mk similarity index 72% rename from lineage_pstar.mk rename to lineage_berlin.mk index 5781b89..46c23e8 100644 --- a/lineage_pstar.mk +++ b/lineage_berlin.mk @@ -18,22 +18,22 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -# Inherit from pstar device -$(call inherit-product, device/motorola/pstar/device.mk) +# Inherit from berlin device +$(call inherit-product, device/motorola/berlin/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_pstar -PRODUCT_DEVICE := pstar +PRODUCT_NAME := lineage_berlin +PRODUCT_DEVICE := berlin PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := motorola edge 20 pro +PRODUCT_MODEL := motorola edge 20 PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - TARGET_PRODUCT=pstar_retail \ - PRIVATE_BUILD_DESC="pstar_retail-user 11 RRA31.Q3-19-86 dbe8d release-keys" + TARGET_PRODUCT=berlin_retail \ + PRIVATE_BUILD_DESC="berlin_global-user 11 RRG31.Q3-23-85 9bd48 release-keys" -BUILD_FINGERPRINT := motorola/pstar_retail/pstar:11/RRA31.Q3-19-86/dbe8d:user/release-keys \ No newline at end of file +BUILD_FINGERPRINT := motorola/berlin_global/berlin:11/RRG31.Q3-23-85/9bd48:user/release-keys diff --git a/proprietary-files.txt b/proprietary-files.txt index 04c1527..49ede25 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All unpinned blobs below are extracted from RRA31.Q3-19-86 +# All unpinned blobs below are extracted from RRG31.Q3-23-85 # ACDB Data vendor/etc/acdbdata/Bluetooth_cal.acdb @@ -10,12 +10,27 @@ vendor/etc/acdbdata/Headset_cal.acdb vendor/etc/acdbdata/Speaker_cal.acdb vendor/etc/acdbdata/adsp_avs_config.acdb +# Audio firmware +vendor/firmware/cs35l41-dsp1-spk-cali.bin +vendor/firmware/cs35l41-dsp1-spk-cali.wmfw +vendor/firmware/cs35l41-dsp1-spk-prot.bin +vendor/firmware/cs35l41-dsp1-spk-prot.wmfw + # Camera -vendor/lib/libarcsoft_distortion_correction.so -vendor/lib/libarcsoft_dualcam_refocus_image.so -vendor/lib/libarcsoft_dualcam_refocus_video.so +vendor/etc/pwr/PowerFeatureConfig.xml +vendor/etc/pwr/VideoPowerOptFeature.xml +vendor/lib/com.qti.chiusecaseselector.so +vendor/lib/com.qti.settings.kamorta.so +vendor/lib/com.qti.settings.kodiak.so +vendor/lib/com.qti.settings.mannar.so +vendor/lib/com.qti.settings.sdm865.so +vendor/lib/com.qti.settings.sm8350.so +vendor/lib/com.qti.stats.common.so vendor/lib/libarcsoft_portrait_distortion_correction.so +vendor/lib/libarcsoft_distortion_correction.so vendor/lib/libbitmlengine.so +vendor/lib/libbitmlenginev2.so +vendor/lib/libcamera2ndk_vendor.so vendor/lib/libcamera_nn_stub.so vendor/lib/libcamerapostproc.so vendor/lib/libcamxexternalformatutils.so @@ -24,36 +39,39 @@ vendor/lib/libcamxfdalgo.so vendor/lib/libcamxfdengine.so vendor/lib/libcamxifestriping.so vendor/lib/libcamximageformatutils.so +vendor/lib/libcamxqsatalgo.so vendor/lib/libcamxstatscore.so +vendor/lib/libcamxswispiqmodule.so vendor/lib/libcamxswprocessalgo.so vendor/lib/libcamxtintlessalgo.so vendor/lib/libc2d_helper.so vendor/lib/libchilog.so vendor/lib/libcom.qti.chinodeutils.so +vendor/lib/libipebpsstriping170.so vendor/lib/libipebpsstriping.so +vendor/lib/libmmcamera_bestats.so +vendor/lib/libmmcamera_cac3.so vendor/lib/libmmcamera_faceproc.so vendor/lib/libmmcamera_faceproc2.so +vendor/lib/libmmcamera_lscv35.so +vendor/lib/libmmcamera_mfnr.so +vendor/lib/libmmcamera_mfnr_t4.so +vendor/lib/libmmcamera_pdpc.so vendor/lib/libmot_afd.so vendor/lib/libmot_chi_desktop_helper.so vendor/lib/libmot_engine_settings.so vendor/lib/libmotoisdataqueue.so vendor/lib/libmpbase.so +vendor/lib/libofflinedump.so vendor/lib/libofflinelog.so +vendor/lib/libopencv.so vendor/lib/libos.so vendor/lib/libpowercore.so vendor/lib/libswregistrationalgo.so vendor/lib/libsynx.so vendor/lib/libthreadutils.so vendor/lib/libvideooptfeature.so -vendor/lib/libmotcameramodulemonitor.so -vendor/lib64/libmotcameramodulemonitor.so -vendor/lib/libmot_flash_aw3643.so -vendor/lib64/libmot_flash_aw3643.so -vendor/lib/libfcell.so -vendor/lib64/libfcell.so vendor/lib/libvideoutils.so -vendor/lib/libcamxncs.so -vendor/lib64/libcamxncs.so vendor/lib/libvidhance.so vendor/lib/libvidhance_active_ois.so vendor/lib/libvidhance_dmbr.so @@ -63,17 +81,27 @@ vendor/lib/libvidhance_horizon_correction.so vendor/lib/libvidhance_stabilizer.so vendor/lib/libvidhance_zoom_stabilization.so vendor/lib/vendor.qti.hardware.camera.postproc@1.0-service-impl.so +vendor/lib/vendor.qti.hardware.camera.postproc@1.0.so vendor/lib/camera/fdconfigpreview.bin vendor/lib/camera/fdconfigpreviewlite.bin vendor/lib/camera/fdconfigvideo.bin vendor/lib/camera/fdconfigvideolite.bin vendor/lib/hw/camera.qcom.so vendor/lib/hw/com.qti.chi.override.so -vendor/lib64/libarcsoft_distortion_correction.so -vendor/lib64/libarcsoft_dualcam_refocus_image.so -vendor/lib64/libarcsoft_dualcam_refocus_video.so +vendor/lib64/com.qti.chiusecaseselector.so +vendor/lib64/com.qti.settings.kamorta.so +vendor/lib64/com.qti.settings.kodiak.so +vendor/lib64/com.qti.settings.mannar.so +vendor/lib64/com.qti.settings.sdm865.so +vendor/lib64/com.qti.settings.sm8350.so +vendor/lib64/com.qti.stats.common.so +vendor/lib64/libarcsoft_triple_sat.so vendor/lib64/libarcsoft_portrait_distortion_correction.so +vendor/lib64/libarcsoft_distortion_correction.so +vendor/lib64/libarcsoft_triple_zoomtranslator.so vendor/lib64/libbitmlengine.so +vendor/lib64/libbitmlenginev2.so +vendor/lib64/libcamera2ndk_vendor.so vendor/lib64/libcamera_nn_stub.so vendor/lib64/libcamerapostproc.so vendor/lib64/libcamxexternalformatutils.so @@ -82,21 +110,33 @@ vendor/lib64/libcamxfdalgo.so vendor/lib64/libcamxfdengine.so vendor/lib64/libcamxifestriping.so vendor/lib64/libcamximageformatutils.so +vendor/lib64/libcamxqsatalgo.so vendor/lib64/libcamxstatscore.so +vendor/lib64/libcamxswispiqmodule.so vendor/lib64/libcamxswprocessalgo.so vendor/lib64/libcamxtintlessalgo.so vendor/lib64/libc2d_helper.so vendor/lib64/libchilog.so vendor/lib64/libcom.qti.chinodeutils.so +vendor/lib64/libipebpsstriping170.so vendor/lib64/libipebpsstriping.so +vendor/lib64/libmmcamera_bestats.so +vendor/lib64/libmmcamera_cac3.so vendor/lib64/libmmcamera_faceproc.so vendor/lib64/libmmcamera_faceproc2.so +vendor/lib64/libmmcamera_lscv35.so +vendor/lib64/libmmcamera_mfnr.so +vendor/lib64/libmmcamera_mfnr_t4.so +vendor/lib64/libmmcamera_pdpc.so vendor/lib64/libmot_afd.so vendor/lib64/libmot_chi_desktop_helper.so vendor/lib64/libmot_engine_settings.so vendor/lib64/libmotoisdataqueue.so vendor/lib64/libmpbase.so +vendor/lib64/libofflinedump.so vendor/lib64/libofflinelog.so +vendor/lib64/liboffloadhal.so +vendor/lib64/libopencv.so vendor/lib64/libos.so vendor/lib64/libpowercore.so vendor/lib64/libswregistrationalgo.so @@ -114,6 +154,7 @@ vendor/lib64/libvidhance_horizon_correction.so vendor/lib64/libvidhance_stabilizer.so vendor/lib64/libvidhance_zoom_stabilization.so vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so +vendor/lib64/vendor.qti.hardware.camera.postproc@1.0.so vendor/lib64/camera/fdconfigpreview.bin vendor/lib64/camera/fdconfigpreviewlite.bin vendor/lib64/camera/fdconfigvideo.bin @@ -122,12 +163,8 @@ vendor/lib64/hw/camera.qcom.so vendor/lib64/hw/com.qti.chi.override.so # Camera - Components -vendor/lib/camera/components/com.arcsoft.node.capturebokeh.so vendor/lib/camera/components/com.arcsoft.node.dc_capture.so -vendor/lib/camera/components/com.arcsoft.node.realtimebokeh.so -vendor/lib/camera/components/com.arcsoft.node.smooth_transition.so -vendor/lib/camera/components/com.arcsoft.node.uwdc_capture.so -vendor/lib/camera/components/com.arcsoft.node.uwdc_preview.so +vendor/lib/camera/components/com.arcsoft.node.dc_preview.so vendor/lib/camera/components/com.mot.node.c2d.so vendor/lib/camera/components/com.qti.camx.chiiqutils.so vendor/lib/camera/components/com.qti.eisv2.so @@ -136,24 +173,39 @@ vendor/lib/camera/components/com.qti.hvx.addconstant.so vendor/lib/camera/components/com.qti.hvx.binning.so vendor/lib/camera/components/com.qti.node.customhwnode.so vendor/lib/camera/components/com.qti.node.depth.so +vendor/lib/camera/components/com.qti.node.dewarp.so vendor/lib/camera/components/com.qti.node.dummyrtb.so vendor/lib/camera/components/com.qti.node.dummysat.so vendor/lib/camera/components/com.qti.node.eisv2.so vendor/lib/camera/components/com.qti.node.eisv3.so vendor/lib/camera/components/com.qti.node.fcv.so +vendor/lib/camera/components/com.qti.node.formatconversion.so vendor/lib/camera/components/com.qti.node.gpu.so vendor/lib/camera/components/com.qti.node.memcpy.so +vendor/lib/camera/components/com.qti.node.ml.so vendor/lib/camera/components/com.qti.node.remosaic.so vendor/lib/camera/components/com.qti.node.stich.so +vendor/lib/camera/components/com.qti.node.swaidenoiser.so +vendor/lib/camera/components/com.qti.node.swbestats.so +vendor/lib/camera/components/com.qti.node.swcac.so +vendor/lib/camera/components/com.qti.node.swec.so +vendor/lib/camera/components/com.qti.node.swfusion.so +vendor/lib/camera/components/com.qti.node.swlsc.so +vendor/lib/camera/components/com.qti.node.swmctf.so +vendor/lib/camera/components/com.qti.node.swmfnr.so +vendor/lib/camera/components/com.qti.node.swpdpc.so +vendor/lib/camera/components/com.qti.node.swpreprocess.so vendor/lib/camera/components/com.qti.node.swregistration.so vendor/lib/camera/components/com.qti.stats.aec.so vendor/lib/camera/components/com.qti.stats.aecwrapper.so +vendor/lib/camera/components/com.qti.stats.aecxcore.so vendor/lib/camera/components/com.qti.stats.af.so vendor/lib/camera/components/com.qti.stats.afd.so vendor/lib/camera/components/com.qti.stats.afwrapper.so vendor/lib/camera/components/com.qti.stats.asd.so vendor/lib/camera/components/com.qti.stats.awb.so vendor/lib/camera/components/com.qti.stats.awbwrapper.so +vendor/lib/camera/components/com.qti.stats.cnndriver.so vendor/lib/camera/components/com.qti.stats.haf.so vendor/lib/camera/components/com.qti.stats.hafoverride.so vendor/lib/camera/components/com.qti.stats.pdlib.so @@ -167,12 +219,9 @@ vendor/lib/camera/components/com.qtistatic.stats.pdlib.so vendor/lib/camera/components/com.vidhance.node.ica.so vendor/lib/camera/components/com.vidhance.node.processing.so vendor/lib/camera/components/com.vidhance.stats.aec_dmbr.so -vendor/lib64/camera/components/com.arcsoft.node.capturebokeh.so vendor/lib64/camera/components/com.arcsoft.node.dc_capture.so -vendor/lib64/camera/components/com.arcsoft.node.realtimebokeh.so +vendor/lib64/camera/components/com.arcsoft.node.dc_preview.so vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so -vendor/lib64/camera/components/com.arcsoft.node.uwdc_capture.so -vendor/lib64/camera/components/com.arcsoft.node.uwdc_preview.so vendor/lib64/camera/components/com.mot.node.c2d.so vendor/lib64/camera/components/com.qti.camx.chiiqutils.so vendor/lib64/camera/components/com.qti.eisv2.so @@ -181,24 +230,39 @@ vendor/lib64/camera/components/com.qti.hvx.addconstant.so vendor/lib64/camera/components/com.qti.hvx.binning.so vendor/lib64/camera/components/com.qti.node.customhwnode.so vendor/lib64/camera/components/com.qti.node.depth.so +vendor/lib64/camera/components/com.qti.node.dewarp.so vendor/lib64/camera/components/com.qti.node.dummyrtb.so vendor/lib64/camera/components/com.qti.node.dummysat.so vendor/lib64/camera/components/com.qti.node.eisv2.so vendor/lib64/camera/components/com.qti.node.eisv3.so vendor/lib64/camera/components/com.qti.node.fcv.so +vendor/lib64/camera/components/com.qti.node.formatconversion.so vendor/lib64/camera/components/com.qti.node.gpu.so vendor/lib64/camera/components/com.qti.node.memcpy.so +vendor/lib64/camera/components/com.qti.node.ml.so vendor/lib64/camera/components/com.qti.node.remosaic.so vendor/lib64/camera/components/com.qti.node.stich.so +vendor/lib64/camera/components/com.qti.node.swaidenoiser.so +vendor/lib64/camera/components/com.qti.node.swbestats.so +vendor/lib64/camera/components/com.qti.node.swcac.so +vendor/lib64/camera/components/com.qti.node.swec.so +vendor/lib64/camera/components/com.qti.node.swfusion.so +vendor/lib64/camera/components/com.qti.node.swlsc.so +vendor/lib64/camera/components/com.qti.node.swmctf.so +vendor/lib64/camera/components/com.qti.node.swmfnr.so +vendor/lib64/camera/components/com.qti.node.swpdpc.so +vendor/lib64/camera/components/com.qti.node.swpreprocess.so vendor/lib64/camera/components/com.qti.node.swregistration.so vendor/lib64/camera/components/com.qti.stats.aec.so vendor/lib64/camera/components/com.qti.stats.aecwrapper.so +vendor/lib64/camera/components/com.qti.stats.aecxcore.so vendor/lib64/camera/components/com.qti.stats.af.so vendor/lib64/camera/components/com.qti.stats.afd.so vendor/lib64/camera/components/com.qti.stats.afwrapper.so vendor/lib64/camera/components/com.qti.stats.asd.so vendor/lib64/camera/components/com.qti.stats.awb.so vendor/lib64/camera/components/com.qti.stats.awbwrapper.so +vendor/lib64/camera/components/com.qti.stats.cnndriver.so vendor/lib64/camera/components/com.qti.stats.haf.so vendor/lib64/camera/components/com.qti.stats.hafoverride.so vendor/lib64/camera/components/com.qti.stats.pdlib.so @@ -212,64 +276,85 @@ vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so vendor/lib64/camera/components/com.vidhance.node.ica.so vendor/lib64/camera/components/com.vidhance.node.processing.so vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so +vendor/lib64/camera/components/libdepthmapwrapper_secure.so # Camera - eeprom -vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_ov32b_eeprom.so +vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov08a10_eeprom.so +vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov16a10_eeprom.so +vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.so vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_ov08a10_eeprom.so -vendor/lib/camera/com.mot.eeprom.mot_ov16a10_gt9772.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov32b_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov08a10_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a10_eeprom.so +vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.so vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_ov08a10_eeprom.so -vendor/lib64/camera/com.mot.eeprom.mot_ov16a10_gt9772.so # Camera - etc vendor/etc/camera/aec_golden_tele.bin vendor/etc/camera/arcsoft_calibration_u_dc.bin -vendor/etc/camera/arcsoft_standalone_calibration_u_dc.bin vendor/etc/camera/dual_golden_tele.bin vendor/etc/camera/dual_golden_wide.bin vendor/etc/camera/mot_engine_config.bin vendor/etc/camera/vidhance_calibration -vendor/etc/camera/vidhance_calibration_32 # Camera - feature2 vendor/lib/com.qti.feature2.anchorsync.so vendor/lib/com.qti.feature2.demux.so +vendor/lib/com.qti.feature2.derivedoffline.so vendor/lib/com.qti.feature2.frameselect.so vendor/lib/com.qti.feature2.fusion.so vendor/lib/com.qti.feature2.generic.so -vendor/lib/com.qti.feature2.gs.so +vendor/lib/com.qti.feature2.gs.cedros.so +vendor/lib/com.qti.feature2.gs.kamorta.so +vendor/lib/com.qti.feature2.gs.kodiak.so +vendor/lib/com.qti.feature2.gs.mannar.so +vendor/lib/com.qti.feature2.gs.sdm865.so +vendor/lib/com.qti.feature2.gs.sm8350.so vendor/lib/com.qti.feature2.hdr.so +vendor/lib/com.qti.feature2.mcreprocrt.so vendor/lib/com.qti.feature2.memcpy.so vendor/lib/com.qti.feature2.mfsr.so +vendor/lib/com.qti.feature2.ml.so +vendor/lib/com.qti.feature2.mux.so vendor/lib/com.qti.feature2.qcfa.so vendor/lib/com.qti.feature2.rawhdr.so +vendor/lib/com.qti.feature2.realtimeserializer.so vendor/lib/com.qti.feature2.rt.so +vendor/lib/com.qti.feature2.rtmcx.so vendor/lib/com.qti.feature2.serializer.so +vendor/lib/com.qti.feature2.statsregeneration.so vendor/lib/com.qti.feature2.stub.so vendor/lib/com.qti.feature2.swmf.so vendor/lib64/com.qti.feature2.anchorsync.so vendor/lib64/com.qti.feature2.demux.so +vendor/lib64/com.qti.feature2.derivedoffline.so vendor/lib64/com.qti.feature2.frameselect.so vendor/lib64/com.qti.feature2.fusion.so vendor/lib64/com.qti.feature2.generic.so -vendor/lib64/com.qti.feature2.gs.so +vendor/lib64/com.qti.feature2.gs.cedros.so +vendor/lib64/com.qti.feature2.gs.kamorta.so +vendor/lib64/com.qti.feature2.gs.kodiak.so +vendor/lib64/com.qti.feature2.gs.mannar.so +vendor/lib64/com.qti.feature2.gs.sdm865.so +vendor/lib64/com.qti.feature2.gs.sm8350.so vendor/lib64/com.qti.feature2.hdr.so +vendor/lib64/com.qti.feature2.mcreprocrt.so vendor/lib64/com.qti.feature2.memcpy.so vendor/lib64/com.qti.feature2.mfsr.so +vendor/lib64/com.qti.feature2.ml.so +vendor/lib64/com.qti.feature2.mux.so vendor/lib64/com.qti.feature2.qcfa.so vendor/lib64/com.qti.feature2.rawhdr.so +vendor/lib64/com.qti.feature2.realtimeserializer.so vendor/lib64/com.qti.feature2.rt.so +vendor/lib64/com.qti.feature2.rtmcx.so vendor/lib64/com.qti.feature2.serializer.so +vendor/lib64/com.qti.feature2.statsregeneration.so vendor/lib64/com.qti.feature2.stub.so vendor/lib64/com.qti.feature2.swmf.so -# Camera firmware +# Camera - ICP vendor/firmware/CAMERA_ICP.elf -vendor/firmware/mot_dw9781c.prog +vendor/firmware/CAMERA_ICP_170.elf # Camera - Motorola vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service @@ -280,68 +365,53 @@ vendor/lib/motorola.hardware.camera.desktop@2.0.so vendor/lib64/motorola.hardware.camera.desktop@1.0.so vendor/lib64/motorola.hardware.camera.desktop@2.0.so +# Camera - OIS +vendor/firmware/mot_bu63169.coeff +vendor/firmware/mot_bu63169.prog + # Camera - sensor vendor/lib/camera/com.qti.sensor.mot_ov08a10.so vendor/lib/camera/com.qti.sensor.mot_ov16a10.so -vendor/lib/camera/com.qti.sensor.mot_ov16a1q.so -vendor/lib/camera/com.qti.sensor.mot_ov32b.so +vendor/lib/camera/com.qti.sensor.mot_ov32b40.so vendor/lib/camera/com.qti.sensor.mot_s5khm2.so vendor/lib64/camera/com.qti.sensor.mot_ov08a10.so vendor/lib64/camera/com.qti.sensor.mot_ov16a10.so -vendor/lib64/camera/com.qti.sensor.mot_ov16a1q.so -vendor/lib64/camera/com.qti.sensor.mot_ov32b.so +vendor/lib64/camera/com.qti.sensor.mot_ov32b40.so vendor/lib64/camera/com.qti.sensor.mot_s5khm2.so # Camera - sensormodule -vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov08a10.bin -vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov16a10.bin -vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov16a1q.bin -vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov32b.bin -vendor/lib/camera/com.qti.sensormodule.mot_pstar_s5khm2.bin -vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov08a10.bin -vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov16a10.bin -vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov16a1q.bin -vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov32b.bin -vendor/lib64/camera/com.qti.sensormodule.mot_pstar_s5khm2.bin +vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov08a10_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov16a10_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov32b40_qtech.bin +vendor/lib/camera/com.qti.sensormodule.mot_berlin_s5khm2_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov08a10_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov16a10_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov32b40_qtech.bin +vendor/lib64/camera/com.qti.sensormodule.mot_berlin_s5khm2_qtech.bin # Camera - tuned vendor/lib/camera/com.qti.tuned.default.bin -vendor/lib/camera/com.qti.tuned.mot_pstar_ov08a10.bin -vendor/lib/camera/com.qti.tuned.mot_pstar_ov16a10.bin -vendor/lib/camera/com.qti.tuned.mot_pstar_ov16a1q.bin -vendor/lib/camera/com.qti.tuned.mot_pstar_ov32b.bin -vendor/lib/camera/com.qti.tuned.mot_pstar_s5khm2.bin +vendor/lib/camera/com.qti.tuned.mot_berlin_ov08a10.bin +vendor/lib/camera/com.qti.tuned.mot_berlin_ov16a10.bin +vendor/lib/camera/com.qti.tuned.mot_berlin_ov32b40.bin +vendor/lib/camera/com.qti.tuned.mot_berlin_s5khm2.bin vendor/lib64/camera/com.qti.tuned.default.bin -vendor/lib64/camera/com.qti.tuned.mot_pstar_ov08a10.bin -vendor/lib64/camera/com.qti.tuned.mot_pstar_ov16a10.bin -vendor/lib64/camera/com.qti.tuned.mot_pstar_ov16a1q.bin -vendor/lib64/camera/com.qti.tuned.mot_pstar_ov32b.bin -vendor/lib64/camera/com.qti.tuned.mot_pstar_s5khm2.bin - -# Camera - VL53L1 -vendor/bin/vl53l1_daemon -vendor/lib64/libvl53l1_daemon.so -vendor/lib64/sensors.tof.vl53l1.so +vendor/lib64/camera/com.qti.tuned.mot_berlin_ov08a10.bin +vendor/lib64/camera/com.qti.tuned.mot_berlin_ov16a10.bin +vendor/lib64/camera/com.qti.tuned.mot_berlin_ov32b40.bin +vendor/lib64/camera/com.qti.tuned.mot_berlin_s5khm2.bin # Display calibration data vendor/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.xml vendor/etc/qdcm_calib_data_mipi_mot_cmd_visionox_1080p_dsc_667.xml # Fingerprint -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc -vendor/bin/hw/fpc_ident:vendor/bin/fpc_ident -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-goodixservice.rc -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc -vendor/etc/init/init.gf_ident.rc -vendor/lib64/com.fingerprints.extension@1.0.so -vendor/lib64/com.motorola.hardware.biometric.fingerprint@1.0.so vendor/lib64/hw/fingerprint.goodix.default.so -vendor/lib64/libgf_ca.so -vendor/lib64/libgf_hal.so vendor/lib64/libgoodixhwfingerprint.so vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so -vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so +vendor/lib64/com.motorola.hardware.biometric.fingerprint@1.0.so +vendor/lib64/libgf_hal.so +vendor/lib64/libgf_ca.so # NFC vendor/bin/STFlashTool @@ -349,7 +419,11 @@ vendor/etc/init/hw/init.vendor.st21nfc.rc # NFC - configs vendor/etc/libnfc-hal-st.conf +vendor/etc/libnfc-mtp-SN100.conf +vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf vendor/etc/libnfc-nci-st.conf +vendor/etc/libnfc-qrd-SN100.conf +vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf vendor/etc/st21nfc_conf_ds.txt vendor/etc/st21nfc_conf_ss.txt @@ -361,37 +435,53 @@ vendor/etc/vhw.xml # Sensor - configs vendor/etc/sensors/config/ak991x_0.json -vendor/etc/sensors/config/default_sensors.json -vendor/etc/sensors/config/dynamic_sensors.json -vendor/etc/sensors/config/irq.json +vendor/etc/sensors/config/kodiak_default_sensors.json +vendor/etc/sensors/config/kodiak_dynamic_sensors.json +vendor/etc/sensors/config/kodiak_irq.json +vendor/etc/sensors/config/kodiak_power_0.json vendor/etc/sensors/config/lsm6dso_0.json -vendor/etc/sensors/config/lsm6dso_0_16g.json -vendor/etc/sensors/config/mmc56x3x_0.json +vendor/etc/sensors/config/mmc5603x_0.json vendor/etc/sensors/config/mot_camgest.json -vendor/etc/sensors/config/mot_chopchop.json vendor/etc/sensors/config/mot_devorient.json -vendor/etc/sensors/config/mot_ftm.json -vendor/etc/sensors/config/mot_ltv.json -vendor/etc/sensors/config/mot_offbody.json -vendor/etc/sensors/config/power_0.json vendor/etc/sensors/config/sns_amd.json vendor/etc/sensors/config/sns_amd_sw_disabled.json +vendor/etc/sensors/config/sns_amd_sw_enabled.json +vendor/etc/sensors/config/sns_aont.json +vendor/etc/sensors/config/sns_basic_gestures.json +vendor/etc/sensors/config/sns_bring_to_ear.json vendor/etc/sensors/config/sns_ccd.json +vendor/etc/sensors/config/sns_ccd_v2_walk.json +vendor/etc/sensors/config/sns_ccd_v3_1_walk.json vendor/etc/sensors/config/sns_ccd_v3_walk.json vendor/etc/sensors/config/sns_cm.json vendor/etc/sensors/config/sns_dae.json +vendor/etc/sensors/config/sns_device_orient.json vendor/etc/sensors/config/sns_diag_filter.json +vendor/etc/sensors/config/sns_distance_bound.json +vendor/etc/sensors/config/sns_dpc.json +vendor/etc/sensors/config/sns_facing.json vendor/etc/sensors/config/sns_fmv.json +vendor/etc/sensors/config/sns_fmv_legacy.json vendor/etc/sensors/config/sns_geomag_rv.json vendor/etc/sensors/config/sns_gyro_cal.json +vendor/etc/sensors/config/sns_heart_rate.json vendor/etc/sensors/config/sns_mag_cal.json +vendor/etc/sensors/config/sns_mag_cal_legacy.json +vendor/etc/sensors/config/sns_multishake.json +vendor/etc/sensors/config/sns_pedometer.json vendor/etc/sensors/config/sns_rmd.json vendor/etc/sensors/config/sns_rotv.json vendor/etc/sensors/config/sns_smd.json vendor/etc/sensors/config/sns_tilt.json vendor/etc/sensors/config/sns_tilt_sw_disabled.json -vendor/etc/sensors/config/stk3a5x_0.json +vendor/etc/sensors/config/sns_tilt_sw_enabled.json +vendor/etc/sensors/config/sns_tilt_to_wake.json +vendor/etc/sensors/config/sns_wrist_pedo.json +vendor/etc/sensors/config/stk3a5x_0_always.json +vendor/etc/sensors/config/stk3a5x_0_emerald_always.json +vendor/etc/sensors/config/stk3a5x_0_white_always.json vendor/etc/sensors/hals.conf +vendor/etc/sensors/proto/als_mastercal.proto vendor/etc/sensors/proto/descriptor.proto vendor/etc/sensors/proto/mot_barocal.proto vendor/etc/sensors/proto/mot_camgest.proto @@ -478,20 +568,19 @@ vendor/etc/sensors/proto/sns_thermopile.proto vendor/etc/sensors/proto/sns_threshold.proto vendor/etc/sensors/proto/sns_tilt.proto vendor/etc/sensors/proto/sns_tilt_to_wake.proto +vendor/etc/sensors/proto/sns_trimag.proto vendor/etc/sensors/proto/sns_ultra_violet.proto vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto -vendor/etc/sensors/proto/tcs3708.proto vendor/etc/sensors/sns_reg_config # Thermal engine - configs vendor/etc/thermal-engine.conf -vendor/etc/thermal-engine-pstar.conf -vendor/etc/thermal-engine-pstar-perf.conf +vendor/etc/thermal-engine-berlin.conf # Touchscreen firmware vendor/firmware/csot_stm_fts_production_limits.csv -vendor/firmware/stmicro-csot-fts3639-21120227-de141027-pstar.ftb -vendor/firmware/stmicro-visionox-fts3639-21072312-0009200c-pstar.ftb +vendor/firmware/stmicro-csot-fts3639-21120227-de141027-berlin.ftb +vendor/firmware/stmicro-visionox-fts3639-21072312-0009200c-berlin.ftb vendor/firmware/visionox_stm_fts_production_limits.csv diff --git a/resource-overlay/pstar/Frameworks/Android.bp b/resource-overlay/berlin/Frameworks/Android.bp similarity index 69% rename from resource-overlay/pstar/Frameworks/Android.bp rename to resource-overlay/berlin/Frameworks/Android.bp index f403add..95839da 100644 --- a/resource-overlay/pstar/Frameworks/Android.bp +++ b/resource-overlay/berlin/Frameworks/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "FrameworksResPstar", + name: "FrameworksResBerlin", sdk_version: "current", vendor: true } diff --git a/resource-overlay/pstar/Frameworks/AndroidManifest.xml b/resource-overlay/berlin/Frameworks/AndroidManifest.xml similarity index 89% rename from resource-overlay/pstar/Frameworks/AndroidManifest.xml rename to resource-overlay/berlin/Frameworks/AndroidManifest.xml index ad3940a..0ad488e 100644 --- a/resource-overlay/pstar/Frameworks/AndroidManifest.xml +++ b/resource-overlay/berlin/Frameworks/AndroidManifest.xml @@ -4,6 +4,6 @@ SPDX-License-Identifier: Apache-2.0 --> + package="android.overlay.berlin"> diff --git a/resource-overlay/pstar/Frameworks/res/values/config.xml b/resource-overlay/berlin/Frameworks/res/values/config.xml similarity index 99% rename from resource-overlay/pstar/Frameworks/res/values/config.xml rename to resource-overlay/berlin/Frameworks/res/values/config.xml index 5d3113c..c5a98bf 100644 --- a/resource-overlay/pstar/Frameworks/res/values/config.xml +++ b/resource-overlay/berlin/Frameworks/res/values/config.xml @@ -276,7 +276,7 @@ local:4630947043778501761 1080 - 671 + 705 150 diff --git a/resource-overlay/pstar/Frameworks/res/values/dimens.xml b/resource-overlay/berlin/Frameworks/res/values/dimens.xml similarity index 100% rename from resource-overlay/pstar/Frameworks/res/values/dimens.xml rename to resource-overlay/berlin/Frameworks/res/values/dimens.xml diff --git a/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml b/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml new file mode 100644 index 0000000..126986e --- /dev/null +++ b/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml @@ -0,0 +1,106 @@ + + + 0 + 139.28 + 155.5 + 0.9 + 34.36 + 4.73 + 523.93 + 200.75 + 171 + 86.278 + 10.57 + + 33.079 + 30 + 25 + 20 + 15 + 10 + 5 + 1.463 + + + 4 + 3 + 1 + + + 300000 + 691200 + 806400 + 940800 + 1152000 + 1324800 + 1516800 + 1651200 + 1804800 + + + 691200 + 940800 + 1228800 + 1344000 + 1516800 + 1651200 + 1900800 + 2054400 + 2131200 + 2400000 + + + 806400 + 1056000 + 1324800 + 1516800 + 1766400 + 1862400 + 2035200 + 2208000 + 2380800 + 2400000 + + + 4.13 + 6.9 + 7.26 + 8.88 + 12.17 + 15.7 + 20.06 + 25.76 + 30.9 + + + 26.93 + 20.23 + 57.22 + 71.71 + 91.77 + 108.31 + 158.29 + 182.69 + 186.79 + 230.89 + + + 34.69 + 49.4 + 70.56 + 89.92 + 117.81 + 129.49 + 185.7 + 184.51 + 218.2 + 233.16 + + 1.13 + 1.13 + 1.13 + 5.5 + 15.86 + 5.79 + 4000 + \ No newline at end of file diff --git a/resource-overlay/pstar/SystemUI/Android.bp b/resource-overlay/berlin/SystemUI/Android.bp similarity index 70% rename from resource-overlay/pstar/SystemUI/Android.bp rename to resource-overlay/berlin/SystemUI/Android.bp index 60b8c07..e6148e3 100644 --- a/resource-overlay/pstar/SystemUI/Android.bp +++ b/resource-overlay/berlin/SystemUI/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "SystemUIResPstar", + name: "SystemUIResBerlin", sdk_version: "current", vendor: true } diff --git a/resource-overlay/pstar/SystemUI/AndroidManifest.xml b/resource-overlay/berlin/SystemUI/AndroidManifest.xml similarity index 86% rename from resource-overlay/pstar/SystemUI/AndroidManifest.xml rename to resource-overlay/berlin/SystemUI/AndroidManifest.xml index f116be5..784c2bf 100644 --- a/resource-overlay/pstar/SystemUI/AndroidManifest.xml +++ b/resource-overlay/berlin/SystemUI/AndroidManifest.xml @@ -5,6 +5,6 @@ --> + package="com.android.systemui.overlay.berlin"> diff --git a/resource-overlay/pstar/SystemUI/res/values-land/dimens.xml b/resource-overlay/berlin/SystemUI/res/values-land/dimens.xml similarity index 100% rename from resource-overlay/pstar/SystemUI/res/values-land/dimens.xml rename to resource-overlay/berlin/SystemUI/res/values-land/dimens.xml diff --git a/resource-overlay/pstar/SystemUI/res/values/dimens.xml b/resource-overlay/berlin/SystemUI/res/values/dimens.xml similarity index 97% rename from resource-overlay/pstar/SystemUI/res/values/dimens.xml rename to resource-overlay/berlin/SystemUI/res/values/dimens.xml index 1c8a18e..e274923 100644 --- a/resource-overlay/pstar/SystemUI/res/values/dimens.xml +++ b/resource-overlay/berlin/SystemUI/res/values/dimens.xml @@ -21,7 +21,7 @@ 10.0px - 776px + 810px - 776px + 810px - 392px - 494px + 300px + 482px diff --git a/resource-overlay/pstar/SystemUI/res/values/integers.xml b/resource-overlay/berlin/SystemUI/res/values/integers.xml similarity index 100% rename from resource-overlay/pstar/SystemUI/res/values/integers.xml rename to resource-overlay/berlin/SystemUI/res/values/integers.xml diff --git a/resource-overlay/pstar/Frameworks/res/xml/power_profile.xml b/resource-overlay/pstar/Frameworks/res/xml/power_profile.xml deleted file mode 100644 index 3a0a68a..0000000 --- a/resource-overlay/pstar/Frameworks/res/xml/power_profile.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - 100 - 450 - 1.2 - 68 - 75.7 - 24.9 - 123.6 - 187 - 662.3 - 47.4 - 237.8 - 45 - - 38.8 - 35 - 30 - 25 - 20 - 15 - 10 - 8 - - - 4 - 3 - 1 - - - 300000 - 403200 - 518400 - 614400 - 691200 - 787200 - 883200 - 979200 - 1075200 - 1171200 - 1248000 - 1344000 - 1420800 - 1516800 - 1612800 - 1708800 - 1804800 - - - 17.398 - 17.709 - 18.098 - 18.380 - 18.424 - 18.624 - 18.641 - 21.351 - 21.568 - 21.594 - 21.675 - 22.185 - 22.325 - 22.431 - 22.545 - 24.618 - 25.684 - - - 710400 - 825600 - 940800 - 1056000 - 1171200 - 1286400 - 1382400 - 1478400 - 1574400 - 1670400 - 1766400 - 1862400 - 1958400 - 2054400 - 2150400 - 2246400 - 2342400 - 2419200 - - - 30 - 37 - 45 - 51 - 60 - 68 - 72 - 81 - 94 - 100 - 109 - 133 - 141 - 149 - 163 - 180 - 198 - 209 - - - 844800 - 960000 - 1075200 - 1190400 - 1305600 - 1401600 - 1516800 - 1632000 - 1747200 - 1862400 - 1977600 - 2073600 - 2169600 - 2265600 - 2361600 - 2457600 - 2553600 - 2649600 - 2745600 - 2841600 - - - 53 - 61 - 67 - 76 - 88 - 92 - 102 - 116 - 129 - 133 - 168 - 182 - 224 - 233 - 240 - 249 - 272 - 295 - 330 - 366 - - 11.5 - 8.7 - - 20 - - 4500 - 5 - 130 - 160 - 3700 - \ No newline at end of file diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 5a4646d..89079b5 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,8 +8,8 @@ set -e -export DEVICE=pstar -export DEVICE_COMMON=sm8250-common +export DEVICE=berlin +export DEVICE_COMMON=sm7325-common export VENDOR=motorola "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@" diff --git a/system.prop b/system.prop index 13e049f..9f29100 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,3 @@ # Google -ro.opa.device_model_id=motorola-pstar +ro.opa.device_model_id=motorola-berlin ro.opa.eligible_device=true diff --git a/touch/Android.bp b/touch/Android.bp index d85f1a8..b24be52 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -14,9 +14,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.touch@1.0-service.pstar", - vintf_fragments: ["vendor.lineage.touch@1.0-service.pstar.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.pstar.rc"], + name: "vendor.lineage.touch@1.0-service.berlin", + vintf_fragments: ["vendor.lineage.touch@1.0-service.berlin.xml"], + init_rc: ["vendor.lineage.touch@1.0-service.berlin.rc"], defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/touch/service.cpp b/touch/service.cpp index db6f55f..455bc22 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "lineage.touch@1.0-service.pstar" +#define LOG_TAG "lineage.touch@1.0-service.berlin" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.pstar.rc b/touch/vendor.lineage.touch@1.0-service.berlin.rc similarity index 90% rename from touch/vendor.lineage.touch@1.0-service.pstar.rc rename to touch/vendor.lineage.touch@1.0-service.berlin.rc index 44a737e..cd4325c 100644 --- a/touch/vendor.lineage.touch@1.0-service.pstar.rc +++ b/touch/vendor.lineage.touch@1.0-service.berlin.rc @@ -1,4 +1,4 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.pstar +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlin interface vendor.lineage.touch@1.0::IHighTouchPollingRate default class hal user system diff --git a/touch/vendor.lineage.touch@1.0-service.pstar.xml b/touch/vendor.lineage.touch@1.0-service.berlin.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.pstar.xml rename to touch/vendor.lineage.touch@1.0-service.berlin.xml