Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 11947112 from 4ade1a2615 to mainline-tzdata6-release

Browse source 
Change-Id: Ib0d9dbd0b27b29916ee1448c06a4d6b9de655f5d
This commit is contained in:
Android Build Coastguard Worker 2024-06-10 10:13:59 +00:00
commit c4f18159a7
5 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
conf/init.efs.16k.rc
View file

@ -9,12 +9,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4 on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4
mkdir /data/vendor/copied 0775 radio system mkdir /data/vendor/copied 0775 radio system
restorecon_recursive /data/vendor/copied restorecon_recursive /data/vendor/copied
restorecon_recursive /mnt/vendor
mount_all /vendor/etc/fstab.efs
mount_all /vendor/etc/fstab.persist
exec_start copy_efs_files_to_data exec_start copy_efs_files_to_data
umount_all /vendor/etc/fstab.efs
umount_all /vendor/etc/fstab.persist
mount_all /vendor/etc/fstab.efs.from_data mount_all /vendor/etc/fstab.efs.from_data
restorecon_recursive /mnt/vendor/efs restorecon_recursive /mnt/vendor/efs
restorecon_recursive /mnt/vendor/efs_backup restorecon_recursive /mnt/vendor/efs_backup

12
copy_efs_files_to_data.sh
View file

@ -8,19 +8,19 @@ $BIN_DIR/mkdir -p $CHECKPOINT_DIR
function copy_files_to_data() function copy_files_to_data()
{ {
block_device=$1
partition_name=$(basename $1) partition_name=$(basename $1)
mount_point=$2 mount_point=$2
tmpdir=$CHECKPOINT_DIR/$partition_name.img tmpdir=$CHECKPOINT_DIR/$partition_name.img
build_checkpoint=$CHECKPOINT_DIR/$partition_name build_checkpoint=$CHECKPOINT_DIR/$partition_name
if [ ! -e $build_checkpoint ]; then if [ ! -e $build_checkpoint ]; then
$BIN_DIR/rm -rf $tmpdir $BIN_DIR/rm -rf $tmpdir
$BIN_DIR/rm -rf $build_checkpoint $BIN_DIR/mkdir -p $tmpdir
cp -rp $mount_point $tmpdir $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to cp -rp $mount_point $tmpdir" echo "Failed to $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device"
return return
fi fi
fsync `find $tmpdir -type fd`
mv $tmpdir $build_checkpoint mv $tmpdir $build_checkpoint
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "mv $tmpdir $build_checkpoint" echo "mv $tmpdir $build_checkpoint"
@ -31,12 +31,8 @@ function copy_files_to_data()
echo "Successfully copied $mount_point to $build_checkpoint" echo "Successfully copied $mount_point to $build_checkpoint"
} }
chmod g+rx -R /mnt/vendor/efs
chmod g+rx -R /mnt/vendor/efs_backup
chmod g+rx -R /mnt/vendor/modem_userdata
copy_files_to_data "/dev/block/by-name/efs" "/mnt/vendor/efs" copy_files_to_data "/dev/block/by-name/efs" "/mnt/vendor/efs"
copy_files_to_data "/dev/block/by-name/efs_backup" "/mnt/vendor/efs_backup" copy_files_to_data "/dev/block/by-name/efs_backup" "/mnt/vendor/efs_backup"
copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userdata" copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userdata"
chmod g+rx -R /mnt/vendor/persist
copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist" copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist"

1
default-permissions.xml
View file

@ -59,7 +59,6 @@
<!-- Camera --> <!-- Camera -->
<permission name="android.permission.CAMERA" fixed="false"/> <permission name="android.permission.CAMERA" fixed="false"/>
<!-- Camera Connectivity --> <!-- Camera Connectivity -->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/> <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
<permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/> <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
<permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/> <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>

3
device.mk
View file

@ -366,6 +366,7 @@ PRODUCT_COPY_FILES += \
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \
PRODUCT_PACKAGES += copy_efs_files_to_data PRODUCT_PACKAGES += copy_efs_files_to_data
PRODUCT_PACKAGES += fsck.f2fs.vendor
else else
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/zuma/conf/init.efs.4k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc device/google/zuma/conf/init.efs.4k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc
@ -948,7 +949,9 @@ PRODUCT_PACKAGES += ShannonRcs
# Exynos RIL and telephony # Exynos RIL and telephony
# Multi SIM(DSDS) # Multi SIM(DSDS)
SIM_COUNT := 2 SIM_COUNT := 2
$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
SUPPORT_MULTI_SIM := true SUPPORT_MULTI_SIM := true
# Support NR # Support NR
SUPPORT_NR := true SUPPORT_NR := true
# Support 5G on both stacks # Support 5G on both stacks

1
usb/usb/Android.bp
View file

@ -55,6 +55,7 @@ cc_binary {
"libbinder_ndk", "libbinder_ndk",
"libprotobuf-cpp-lite", "libprotobuf-cpp-lite",
"server_configurable_flags", "server_configurable_flags",
"libaconfig_storage_read_api_cc",
], ],
static_libs: [ static_libs: [
"libpixelusb-aidl", "libpixelusb-aidl",