Snap for 8638406 from 7c68144939
to udc-release
Change-Id: I2da3ce24ec93a2cb3770799b05e20b27489e2da5
This commit is contained in:
commit
a871972ff5
7 changed files with 6 additions and 30 deletions
|
@ -82,7 +82,6 @@ AB_OTA_UPDATER := true
|
||||||
|
|
||||||
AB_OTA_PARTITIONS += \
|
AB_OTA_PARTITIONS += \
|
||||||
system \
|
system \
|
||||||
system_dlkm \
|
|
||||||
system_ext \
|
system_ext \
|
||||||
product \
|
product \
|
||||||
vbmeta_system
|
vbmeta_system
|
||||||
|
@ -139,7 +138,7 @@ $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLO
|
||||||
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
|
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
|
||||||
|
|
||||||
# Enable chain partition for system.
|
# Enable chain partition for system.
|
||||||
BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product
|
BOARD_AVB_VBMETA_SYSTEM := system system_ext product
|
||||||
BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
|
BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
|
||||||
BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
|
BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
|
||||||
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
|
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
|
||||||
|
@ -167,11 +166,6 @@ TARGET_COPY_OUT_PRODUCT := product
|
||||||
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
|
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
TARGET_COPY_OUT_SYSTEM_EXT := system_ext
|
TARGET_COPY_OUT_SYSTEM_EXT := system_ext
|
||||||
|
|
||||||
# system_dlkm.img
|
|
||||||
BOARD_USES_SYSTEM_DLKMIMAGE := true
|
|
||||||
BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
|
|
||||||
TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm
|
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# Video Codec
|
# Video Codec
|
||||||
########################
|
########################
|
||||||
|
@ -189,7 +183,6 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
|
||||||
BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032
|
BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032
|
||||||
BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||||
system \
|
system \
|
||||||
system_dlkm \
|
|
||||||
system_ext \
|
system_ext \
|
||||||
product \
|
product \
|
||||||
vendor \
|
vendor \
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#
|
#
|
||||||
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
|
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
|
||||||
system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||||
system_dlkm /system_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
|
||||||
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||||
product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||||
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
|
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
|
||||||
|
|
|
@ -519,8 +519,6 @@ PRODUCT_PACKAGES += \
|
||||||
# for now include gralloc here. should come from hardware/google_devices/exynos5
|
# for now include gralloc here. should come from hardware/google_devices/exynos5
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.graphics.mapper@4.0-impl \
|
android.hardware.graphics.mapper@4.0-impl \
|
||||||
android.hardware.graphics.allocator@4.0-service \
|
|
||||||
android.hardware.graphics.allocator@4.0-impl \
|
|
||||||
android.hardware.graphics.allocator-V1-service
|
android.hardware.graphics.allocator-V1-service
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="aidl" optional="true">
|
<hal format="aidl" optional="true">
|
||||||
<name>com.google.hardware.pixel.display</name>
|
<name>com.google.hardware.pixel.display</name>
|
||||||
<version>4</version>
|
<version>5</version>
|
||||||
<interface>
|
<interface>
|
||||||
<name>IDisplay</name>
|
<name>IDisplay</name>
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
|
|
|
@ -961,6 +961,10 @@ void DumpstateDevice::dumpDisplaySection(int fd) {
|
||||||
CommandOptions::WithTimeout(2).Build());
|
CommandOptions::WithTimeout(2).Build());
|
||||||
DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
|
DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
|
||||||
DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
|
DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
|
||||||
|
RunCommandToFd(fd, "HWC logs", {"/vendor/bin/sh", "-c",
|
||||||
|
"for f in $(ls /data/vendor/log/hwc/*hwc_*); do "
|
||||||
|
"echo $f ; cat $f ; done"},
|
||||||
|
CommandOptions::WithTimeout(2).Build());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dump items related to AoC
|
// Dump items related to AoC
|
||||||
|
|
|
@ -39,15 +39,6 @@
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl">
|
|
||||||
<name>android.hardware.graphics.allocator</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<version>4.0</version>
|
|
||||||
<interface>
|
|
||||||
<name>IAllocator</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl">
|
<hal format="hidl">
|
||||||
<name>android.hardware.graphics.mapper</name>
|
<name>android.hardware.graphics.mapper</name>
|
||||||
<transport arch="32+64">passthrough</transport>
|
<transport arch="32+64">passthrough</transport>
|
||||||
|
|
|
@ -26,15 +26,6 @@
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl">
|
|
||||||
<name>android.hardware.graphics.allocator</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<version>4.0</version>
|
|
||||||
<interface>
|
|
||||||
<name>IAllocator</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl">
|
<hal format="hidl">
|
||||||
<name>android.hardware.graphics.mapper</name>
|
<name>android.hardware.graphics.mapper</name>
|
||||||
<transport arch="32+64">passthrough</transport>
|
<transport arch="32+64">passthrough</transport>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue