From: deadman96385 Date: Tue, 24 Mar 2020 00:57:40 +0000 (-0500) Subject: Rebrand it to troika X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=467c5ea6e177606b1fa4f24fe2f51a4d1ca8f66f;p=GitHub%2Fmoto-9609%2Ftwrp_device_motorola_troika.git Rebrand it to troika --- diff --git a/Android.mk b/Android.mk index 936cf6c..6cb4dce 100644 --- a/Android.mk +++ b/Android.mk @@ -25,7 +25,7 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),guacamole) +ifeq ($(TARGET_DEVICE),troika) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 8d852d3..7554165 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/omni_guacamole.mk + $(LOCAL_DIR)/omni_troika.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 0284823..9fb646b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -25,48 +25,47 @@ # Architecture TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-2a +TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := cortex-a75 +TARGET_CPU_VARIANT := cortex-a73 TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := cortex-a75 +TARGET_2ND_CPU_VARIANT := cortex-a53 ENABLE_CPUSETS := true ENABLE_SCHEDBOOST := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := msmnile +TARGET_BOOTLOADER_BOARD_NAME := exynos5 TARGET_NO_BOOTLOADER := true TARGET_USES_UEFI := true # Kernel -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 swiotlb=2048 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 androidboot.usbcontroller=a600000.dwc3 -BOARD_KERNEL_CMDLINE += skip_override androidboot.fastboot=1 -BOARD_KERNEL_BASE := 0x00000000 +BOARD_KERNEL_CMDLINE := androidboot.hardware=exynos9610 androidboot.console=ttyGS0 androidboot.memcg=1 video=vfb:640x400,bpp=32,memsize=3072000 service_locator.enable=1 swiotlb=2048 loop.max_part=7 androidboot.usbcontroller=13200000.dwc3 +BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive +BOARD_KERNEL_BASE := 0x10008000 BOARD_KERNEL_PAGESIZE := 4096 -TARGET_PREBUILT_KERNEL := device/oneplus/guacamole/prebuilt/Image.gz-dtb +TARGET_PREBUILT_KERNEL := device/motorola/troika/prebuilt/Image.gz-dtb # Platform -TARGET_BOARD_PLATFORM := msmnile -TARGET_BOARD_PLATFORM_GPU := qcom-adreno640 -QCOM_BOARD_PLATFORMS += msmnile +TARGET_BOARD_PLATFORM := exynos5 +TARGET_BOARD_PLATFORM_GPU := mali-g72 # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 -BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 -BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3640655872 +BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0 BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := 4096 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 115601780736 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 118974455808 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824 +BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368 TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true @@ -76,8 +75,8 @@ BOARD_USES_RECOVERY_AS_BOOT := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # Partitions (listed in the file) to be wiped under recovery. -TARGET_RECOVERY_WIPE := device/oneplus/guacamole/recovery.wipe -TARGET_RECOVERY_FSTAB := device/oneplus/guacamole/recovery.fstab +TARGET_RECOVERY_WIPE := device/motorola/troika/recovery.wipe +TARGET_RECOVERY_FSTAB := device/motorola/troika/recovery.fstab # Workaround for error copying vendor files to recovery ramdisk @@ -85,8 +84,8 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR := vendor #Init -TARGET_INIT_VENDOR_LIB := libinit_oneplus7pro -TARGET_RECOVERY_DEVICE_MODULES := libinit_oneplus7pro +TARGET_INIT_VENDOR_LIB := libinit_troika +TARGET_RECOVERY_DEVICE_MODULES := libinit_troika TARGET_PLATFORM_DEVICE_BASE := /devices/soc/ # Recovery @@ -137,13 +136,11 @@ BOARD_USES_METADATA_PARTITION := true # Extras BOARD_SUPPRESS_SECURE_ERASE := true -TW_USE_LEDS_HAPTICS := true +#TW_USE_LEDS_HAPTICS := true USE_RECOVERY_INSTALLER := true -RECOVERY_INSTALLER_PATH := device/oneplus/guacamole/installer +RECOVERY_INSTALLER_PATH := device/motorola/troika/installer TW_EXCLUDE_TWRPAPP := true TW_INCLUDE_REPACKTOOLS := true -TW_HAS_EDL_MODE := true TWRP_INCLUDE_LOGCAT := true TARGET_USES_LOGD := true -TW_EXCLUDE_TWRPAPP := true -TW_NO_USB_STORAGE := true +#TW_NO_USB_STORAGE := true diff --git a/README.md b/README.md index dc1449c..db195aa 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ -# Device Tree for OnePlus 7/7 Pro/7 Pro 5G (guacamole, guacamoleb, guacamolec) - -The OnePlus 7 Pro (codenamed _"guacamole"_) is a flagship smartphone from OnePlus. -It was released in May 2019. - - +# Device Tree for Motorola One Action/One Vision (troika, kane) +The Motorola One Action/One Vision (codenamed _"troika/kane"_) is a flagship smartphone from motorola. ## Compile @@ -19,7 +15,7 @@ Then add these string to .repo/manifests/remove.xml Then add these projects to .repo/local_manifests/roomservice.xml (If you don't have it, you can add them to .repo/manifest.xml): ```xml - + ``` Now you can sync your source: @@ -28,7 +24,7 @@ Now you can sync your source: repo sync ``` -To auotomatic make the twrp installer, you need to import this commit in the build/make path: https://gerrit.omnirom.org/#/c/android_build/+/33182/ +To automatically make the twrp installer, you need to import this commit in the build/make path: https://gerrit.omnirom.org/#/c/android_build/+/33182/ Finally execute these: @@ -36,17 +32,16 @@ Finally execute these: . build/envsetup.sh export ALLOW_MISSING_DEPENDENCIES=true export LC_ALL=C -lunch omni_guacamole-eng +lunch omni_troika-eng mka adbd recoveryimage ``` To test it: ``` -fastboot boot out/target/product/guacamole/recovery.img +fastboot boot out/target/product/troika/recovery.img ``` -Kernel Source: https://gitlab.com/HolyAngel/op7 +Kernel Source: https://github.com/deadman96385/android_kernel_motorola_exynos9610 ## Credits -I want to say a big thanks to @twinnfamous -Thanks to @dianlujitao for the base multidevice commit: https://github.com/TeamWin/android_device_oneplus_oneplus3/tree/android-9.0/init +Thanks to @dianlujitao for the base multidevice commit: https://github.com/TeamWin/android_device_motorola_motorola3/tree/android-9.0/init diff --git a/device.mk b/device.mk index addd4b4..b2aa6a1 100644 --- a/device.mk +++ b/device.mk @@ -1,8 +1,8 @@ -LOCAL_PATH := device/oneplus/guacamole +LOCAL_PATH := device/motorola/troika # define hardware platform -PRODUCT_PLATFORM := msmnile +PRODUCT_PLATFORM := exynos9610 #TEST # A/B support @@ -13,7 +13,7 @@ PRODUCT_PACKAGES += \ update_verifier PRODUCT_PACKAGES += \ - bootctrl.msmnile + bootctrl.exynos9610 AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ @@ -24,12 +24,11 @@ AB_OTA_POSTINSTALL_CONFIG += \ # Enable update engine sideloading by including the static version of the # boot_control HAL and its dependencies. PRODUCT_STATIC_BOOT_CONTROL_HAL := \ - bootctrl.msmnile \ + bootctrl.exynos9610 \ libgptutils \ libz \ libcutils - # Boot control HAL PRODUCT_PACKAGES += \ android.hardware.boot@1.0-impl \ diff --git a/init/Android.mk b/init/Android.mk index 27c18e8..84e74d6 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := \ system/core/base/include \ system/core/init -LOCAL_SRC_FILES := init_oneplus7pro.cpp -LOCAL_MODULE := libinit_oneplus7pro +LOCAL_SRC_FILES := init_troika.cpp +LOCAL_MODULE := libinit_troika include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_oneplus7pro.cpp b/init/init_oneplus7pro.cpp deleted file mode 100644 index 20a2d47..0000000 --- a/init/init_oneplus7pro.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* - Copyright (C) 2017-2018 The Android Open Source Project - - Redistribution and use in source and binary forms, with or without - modification, are permitted 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 - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include "property_service.h" -#include "log.h" - -namespace android { -namespace init { - -void load_op7pro(const char *model) { - property_set("ro.product.model", model); - property_set("ro.product.name", "OnePlus7Pro"); - property_set("ro.build.product", "OnePlus7Pro"); - property_set("ro.product.device", "OnePlus7Pro"); - property_set("ro.vendor.product.device", "OnePlus7Pro"); - property_set("ro.display.series", "OnePlus 7 Pro"); -} - -void load_op7pro5g(const char *model) { - property_set("ro.product.model", model); - property_set("ro.product.name", "OnePlus7ProNR"); - property_set("ro.build.product", "OnePlus7ProNR"); - property_set("ro.product.device", "OnePlus7ProNR"); - property_set("ro.vendor.product.device", "OnePlus7ProNR"); - property_set("ro.display.series", "OnePlus 7 Pro 5G"); -} - -void load_op7(const char *model) { - property_set("ro.product.model", model); - property_set("ro.product.name", "OnePlus7"); - property_set("ro.build.product", "OnePlus7"); - property_set("ro.product.device", "OnePlus7"); - property_set("ro.vendor.product.device", "OnePlus7"); - property_set("ro.display.series", "OnePlus 7"); -} - -void vendor_load_properties() { - int project_name = stoi(android::base::GetProperty("ro.boot.project_name", "")); - int rf_version = stoi(android::base::GetProperty("ro.boot.rf_version", "")); - switch(project_name){ - case 18821: - switch (rf_version){ - case 1: - /* China*/ - load_op7pro("GM1910"); - break; - case 3: - /* India*/ - load_op7pro("GM1911"); - break; - case 4: - /* Europe */ - load_op7pro("GM1913"); - break; - case 5: - /* Global / US Unlocked */ - load_op7pro("GM1917"); - break; - default: - /* Generic*/ - load_op7pro("GM1917"); - break; - } - case 18831: - /* T-Mobile */ - load_op7pro("GM1915"); - break; - case 18827: - /* 5g Europe */ - load_op7pro5g("GM1920"); - break; - case 18857: - switch (rf_version){ - case 1: - /* China*/ - load_op7("GM1900"); - break; - case 3: - /* India*/ - load_op7("GM1901"); - break; - case 4: - /* Europe */ - load_op7("GM1903"); - break; - case 5: - /* Global / US Unlocked */ - load_op7("GM1907"); - break; - default: - /* Generic */ - load_op7("GM1907"); - break; - } - } -} - -} // namespace init -} // namespace android diff --git a/init/init_troika.cpp b/init/init_troika.cpp new file mode 100644 index 0000000..ddf93db --- /dev/null +++ b/init/init_troika.cpp @@ -0,0 +1,66 @@ +/* + Copyright (C) 2017-2018 The Android Open Source Project + + Redistribution and use in source and binary forms, with or without + modification, are permitted 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 + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +#include "property_service.h" +#include "log.h" + +namespace android { +namespace init { + +void vendor_load_properties() { + int boot_device = stoi(android::base::GetProperty("ro.boot.device", "")); + + switch (boot_device) { + case troika: + /* Moto One Action */ + property_set("ro.product.model", "Motorola_One_Action"); + property_set("ro.build.product", "one_action"); + property_set("ro.product.device", "one_action"); + property_set("ro.vendor.product.device", "one_action"); + break; + case kane: + /* Moto One Vision */ + property_set("ro.product.model", "Motorola_One_Vision"); + property_set("ro.build.product", "OnePlus3"); + property_set("ro.product.device", "one_vision"); + property_set("ro.vendor.product.device", "one_vision"); + break; + default: + LOG(ERROR) << __func__ << ": unexcepted boot device!"; + } +} + +} // namespace init +} // namespace android \ No newline at end of file diff --git a/installer/META-INF/com/google/android/update-binary b/installer/META-INF/com/google/android/update-binary index c62e870..7ade192 100755 --- a/installer/META-INF/com/google/android/update-binary +++ b/installer/META-INF/com/google/android/update-binary @@ -14,8 +14,8 @@ $BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMO ui_print "########################################"; ui_print "# TWRP installer for #"; -ui_print "# OnePlus 7/7 Pro/7 Pro 5G #"; -ui_print "# by Mauronofrio #"; +ui_print "# Moto One Action/Vision #"; +ui_print "# by deadman96385 #"; ui_print "########################################"; ui_print " "; diff --git a/omni_guacamole.mk b/omni_guacamole.mk deleted file mode 100644 index c21b586..0000000 --- a/omni_guacamole.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright 2017 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Release name -PRODUCT_RELEASE_NAME := guacamole - -$(call inherit-product, build/target/product/embedded.mk) - -# Inherit from our custom product configuration -$(call inherit-product, vendor/omni/config/common.mk) - -# Inherit from hardware-specific part of the product configuration -$(call inherit-product, device/oneplus/guacamole/device.mk) - -## Device identifier. This must come after all inclusions -PRODUCT_DEVICE := guacamole -PRODUCT_NAME := omni_guacamole -PRODUCT_BRAND := OnePlus -PRODUCT_MODEL := GM1917 -PRODUCT_MANUFACTURER := OnePlus - -PRODUCT_BUILD_PROP_OVERRIDES += \ - PRODUCT_NAME=OnePlus7Pro \ - BUILD_PRODUCT=OnePlus7Pro \ - TARGET_DEVICE=OnePlus7Pro - -PRODUCT_SYSTEM_PROPERTY_BLACKLIST += \ - ro.product.model \ - ro.product.device \ - ro.product.name \ - ro.build.product \ - ro.display.series - -# HACK: Set vendor patch level -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.security_patch=2099-12-31 diff --git a/omni_troika.mk b/omni_troika.mk new file mode 100644 index 0000000..28a3d2f --- /dev/null +++ b/omni_troika.mk @@ -0,0 +1,49 @@ +# +# Copyright 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Release name +PRODUCT_RELEASE_NAME := troika + +$(call inherit-product, build/target/product/embedded.mk) + +# Inherit from our custom product configuration +$(call inherit-product, vendor/omni/config/common.mk) + +# Inherit from hardware-specific part of the product configuration +$(call inherit-product, device/motorola/troika/device.mk) + +## Device identifier. This must come after all inclusions +PRODUCT_DEVICE := troika +PRODUCT_NAME := omni_troika +PRODUCT_BRAND := motorola +PRODUCT_MODEL := moto one +PRODUCT_MANUFACTURER := motorola + +PRODUCT_BUILD_PROP_OVERRIDES += \ + PRODUCT_NAME=troika \ + BUILD_PRODUCT=troika \ + TARGET_DEVICE=troika + +PRODUCT_SYSTEM_PROPERTY_BLACKLIST += \ + ro.product.model \ + ro.product.device \ + ro.product.name \ + ro.build.product \ + ro.display.series + +# HACK: Set vendor patch level +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.build.security_patch=2099-12-31 diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb index 851fd7a..0324e5d 100644 Binary files a/prebuilt/Image.gz-dtb and b/prebuilt/Image.gz-dtb differ diff --git a/recovery.fstab b/recovery.fstab index ff40362..4dba092 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -30,26 +30,15 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # -/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect,avb -/dev/block/bootdevice/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable -/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=512M -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,reservedsize=128M -#/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait - -/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/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 +/dev/block/bootdevice/by-name/system / ext4 ro wait,slotselect +/dev/block/bootdevice/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data,reserve_root=32768,resgid=1065 wait,check,formattable,fileencryption=aes-256-xts,quota,reservedsize=128M +/dev/block/bootdevice/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,barrier=1,rw wait +/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait,notrim +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/slotinfo /slotinfo emmc defaults defaults +/dev/block/bootdevice/by-name/persist2 /mnt/product/persist ext4 noatime,nosuid,nodev,barrier=1 wait,formattable,nofail # Removable storage -/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/a600000.ssusb/a600000.dwc3/xhci-hcd.*.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/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults -/dev/block/bootdevice/by-name/op2 /op2 ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check +/devices/platform/13550000.dwmmc2/mmc_host* auto auto default voldmanaged=sdcard1:auto,encryptable=userdata +/devices/platform/13200000.usb* auto vfat default voldmanaged=usb1:auto +/devices/platform/13200000.usb/13200000.dwc3* auto vfat default voldmanaged=usb2:auto \ No newline at end of file diff --git a/system.prop b/system.prop index 65bb76a..0a8f4f5 100644 --- a/system.prop +++ b/system.prop @@ -1,6 +1,6 @@ -ro.display.series=OnePlus 7 Pro -ro.product.board=msmnile -ro.board.platform=msmnile +ro.display.series=Moto One +ro.product.board=exynos9610 +ro.board.platform=exynos9610 ro.build.version.release=9 ro.build.version.security_patch=2099-12-31 vendor.gatekeeper.disable_spu=true diff --git a/vendorsetup.sh b/vendorsetup.sh index ebeaa4c..769bfaf 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1 +1 @@ -add_lunch_combo omni_guacamole-eng +add_lunch_combo omni_troika-eng