Use oem as /vendor

Use PRODUCT_FAKE_TREBLE_BUILD as barrier

Also move product vars includes so we can set based on FAKE_TREBLE
earlier
treble-odm-3
Felix 4 years ago
parent 52dbc9a4dc
commit 796ff85b93

@ -40,8 +40,6 @@ BOARD_KERNEL_CMDLINE += androidboot.bootdevice=7464900.sdhci
# Serial console
#BOARD_KERNEL_CMDLINE += earlycon=msm_serial_dm,0x075b0000 restore_msm_uart=0x01014000
TARGET_RECOVERY_FSTAB ?= $(PLATFORM_COMMON_PATH)/rootdir/vendor/etc/fstab.tone
# Wi-Fi definitions for Broadcom solution but using brcmfmac instead of bcmdhd kernel driver
BOARD_WLAN_DEVICE := qcwcn
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
@ -72,7 +70,25 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 2
# Cache partition
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
include device/sony/common/CommonConfig.mk
ifeq ($(PRODUCT_FAKE_TREBLE_BUILD),true)
# Platform uses separate vendor partition
TARGET_COPY_OUT_VENDOR := vendor
else
# Platform witout a vendor partition
TARGET_COPY_OUT_VENDOR := system/vendor
include device/sony/common/CommonConfig.mk
endif
ifeq ($(PRODUCT_FAKE_TREBLE_BUILD),true)
BOARD_VENDORIMAGE_PARTITION_SIZE := 419430400
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_VENDORIMAGE_JOURNAL_SIZE := 0
BOARD_VENDORIMAGE_EXTFS_INODE_COUNT := 4096
endif
ifeq ($(PRODUCT_FAKE_TREBLE_BUILD),true)
TARGET_RECOVERY_FSTAB ?= $(PLATFORM_COMMON_PATH)/rootdir/vendor/etc/fstab.tone_treble
else
TARGET_RECOVERY_FSTAB ?= $(PLATFORM_COMMON_PATH)/rootdir/vendor/etc/fstab.tone
endif

@ -170,6 +170,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.wifi.addr_path=/sys/devices/platform/soc/soc:bcmdhd_wlan/macaddr
# Not entirely true...
#PRODUCT_SHIPPING_API_LEVEL := 26
# setup dm-verity configs.
PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/7464900.sdhci/by-name/system
$(call inherit-product, build/target/product/verity.mk)

@ -1,5 +1,15 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(PRODUCT_FAKE_TREBLE_BUILD),true)
include $(CLEAR_VARS)
LOCAL_MODULE := fstab.$(TARGET_DEVICE)
LOCAL_SRC_FILES := vendor/etc/fstab.tone_treble
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_STEM := fstab.$(TARGET_DEVICE)
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
include $(BUILD_PREBUILT)
else
include $(CLEAR_VARS)
LOCAL_MODULE := fstab.$(TARGET_DEVICE)
LOCAL_SRC_FILES := vendor/etc/fstab.tone
@ -8,6 +18,7 @@ LOCAL_MODULE_STEM := fstab.$(TARGET_DEVICE)
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
include $(BUILD_PREBUILT)
endif
include $(CLEAR_VARS)
LOCAL_MODULE := init.tone

@ -0,0 +1,19 @@
# Android fstab file.
# 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
/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly
/dev/block/bootdevice/by-name/oem /vendor ext4 ro,barrier=1 wait,recoveryonly
/dev/block/bootdevice/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic wait,check,formattable
/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic wait,check,formattable,encryptable=footer,quota
/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults
/dev/block/bootdevice/by-name/FOTAKernel /recovery emmc defaults defaults
/dev/block/bootdevice/by-name/frp /persistent emmc defaults defaults
/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1,data=ordered,nodelalloc,errors=panic wait,notrim
/dev/block/bootdevice/by-name/apps_log /misc emmc defaults defaults
/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:vendor_firmware_file:s0 wait
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nodelalloc,errors=panic wait,notrim
/devices/platform/soc/74a4900.sdhci/mmc_host/mmc* auto auto nosuid,nodev voldmanaged=sdcard1:auto,encryptable=userdata
/devices/platform/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb* auto auto nosuid,nodev voldmanaged=usb:auto
/dev/block/zram0 none swap defaults zramsize=1073741824,max_comp_streams=4
Loading…
Cancel
Save