Snap for 12361654 from 2b08e414d0 to 24Q4-release
Change-Id: I5d5a2cc2412b3475ebe9f10d7d3dac7fdd1253bc
This commit is contained in:
Android Build Coastguard Worker
commit
a7290c3578
5 changed files with 198 additions and 1 deletions
19
BoardConfig-16k-common.mk
Normal file
19
BoardConfig-16k-common.mk
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
#
|
||||
# Copyright (C) 2024 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.
|
||||
#
|
||||
|
||||
ifeq ($(TARGET_BOOTS_16K),true)
|
||||
BOARD_F2FS_BLOCKSIZE := 16384
|
||||
endif
|
||||
|
|
@ -16,6 +16,9 @@
|
|||
include build/make/target/board/BoardConfigMainlineCommon.mk
|
||||
include build/make/target/board/BoardConfigPixelCommon.mk
|
||||
|
||||
# Include settings for 16k page size kernel if enabled.
|
||||
include device/google/zumapro/BoardConfig-16k-common.mk
|
||||
|
||||
# HACK : To fix up after bring up multimedia devices.
|
||||
TARGET_SOC := zumapro
|
||||
|
||||
|
|
|
|||
164
conf/fs-16kb/Android.bp
Normal file
164
conf/fs-16kb/Android.bp
Normal file
|
|
@ -0,0 +1,164 @@
|
|||
/*
|
||||
* Copyright (C) 2024 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.
|
||||
*/
|
||||
|
||||
// By default this device uses hardware-wrapped keys for storage encryption,
|
||||
// which is intended to offer increased security over the traditional method
|
||||
// (software keys). However, hardware-wrapped keys aren't compatible with
|
||||
// FIPS-140 certification of the encryption hardware, and hence we have to
|
||||
// disable the use of them in FIPS mode. This requires having two fstab files:
|
||||
// one for the default mode, and one for FIPS mode selectable via
|
||||
// androidboot.fstab_suffix on the kernel command line. These fstabs should be
|
||||
// identical with the exception of the encryption settings, so to keep them in
|
||||
// sync the rules below generate them from a template file.
|
||||
|
||||
soong_namespace {
|
||||
imports: [
|
||||
"device/google/zumapro",
|
||||
],
|
||||
}
|
||||
|
||||
package {
|
||||
// See: http://go/android-license-faq
|
||||
// A large-scale-change added 'default_applicable_licenses' to import
|
||||
// all of the 'license_kinds' from "device_google_zumapro_license"
|
||||
// to get the below license kinds:
|
||||
// SPDX-license-identifier-Apache-2.0
|
||||
default_applicable_licenses: ["device_google_zumapro_license"],
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zuma-hw-encrypt",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zuma"],
|
||||
cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
|
||||
" -e s/@inlinecrypt@/inlinecrypt/ " +
|
||||
" -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zumapro-hw-encrypt",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zumapro"],
|
||||
cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0+dusize_4k/" +
|
||||
" -e s/@inlinecrypt@/inlinecrypt/ " +
|
||||
" -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zuma-sw-encrypt",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zuma"],
|
||||
cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
|
||||
" -e s/@inlinecrypt@// " +
|
||||
" -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zumapro-sw-encrypt",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zumapro"],
|
||||
cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
|
||||
" -e s/@inlinecrypt@// " +
|
||||
" -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zuma-no-encrypt",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zuma"],
|
||||
cmd: "sed -e s/@fileencryption@//" +
|
||||
" -e s/@inlinecrypt@// " +
|
||||
" -e s/@metadata_encryption@// $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zumapro-no-encrypt",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zumapro"],
|
||||
cmd: "sed -e s/@fileencryption@//" +
|
||||
" -e s/@inlinecrypt@// " +
|
||||
" -e s/@metadata_encryption@// $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zuma-fips",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zuma-fips"],
|
||||
cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
|
||||
" -e s/@inlinecrypt@/inlinecrypt/ " +
|
||||
" -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)",
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "gen_fstab.zumapro-fips",
|
||||
srcs: [
|
||||
":fstab.zumapro.common",
|
||||
"fstab.rw.zumapro.16kb",
|
||||
],
|
||||
out: ["fstab.zumapro-fips"],
|
||||
cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
|
||||
" -e s/@inlinecrypt@/inlinecrypt/ " +
|
||||
" -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)",
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "fstab.zuma",
|
||||
src: ":gen_fstab.zuma-hw-encrypt",
|
||||
vendor: true,
|
||||
vendor_ramdisk_available: true,
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "fstab.zumapro",
|
||||
src: ":gen_fstab.zumapro-hw-encrypt",
|
||||
vendor: true,
|
||||
vendor_ramdisk_available: true,
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "fstab.zuma-fips",
|
||||
src: ":gen_fstab.zuma-fips",
|
||||
vendor: true,
|
||||
vendor_ramdisk_available: true,
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "fstab.zumapro-fips",
|
||||
src: ":gen_fstab.zumapro-fips",
|
||||
vendor: true,
|
||||
vendor_ramdisk_available: true,
|
||||
}
|
||||
6
conf/fs-16kb/fstab.rw.zumapro.16kb
Normal file
6
conf/fs-16kb/fstab.rw.zumapro.16kb
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
# Android fstab file for /data and /metadata partitions.
|
||||
#
|
||||
# This fstab is used for devices that only boot 16kb page size kernels.
|
||||
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
|
||||
/dev/block/platform/13200000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount
|
||||
/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device
|
||||
|
|
@ -299,6 +299,8 @@ USE_GOOGLE_DIALER := true
|
|||
USE_GOOGLE_CARRIER_SETTINGS := true
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.vendor.uses_google_dialer_carrier_settings=1
|
||||
# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true"
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zumapro/proprietary/GoogleDialer
|
||||
endif
|
||||
|
||||
ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true)
|
||||
|
|
@ -457,7 +459,10 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/zumapro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc
|
||||
|
||||
# Fstab files
|
||||
ifeq (ext4,$(TARGET_RW_FILE_SYSTEM_TYPE))
|
||||
ifeq (true,$(TARGET_BOOTS_16K))
|
||||
PRODUCT_SOONG_NAMESPACES += \
|
||||
device/google/zumapro/conf/fs-16kb
|
||||
else ifeq (ext4,$(TARGET_RW_FILE_SYSTEM_TYPE))
|
||||
PRODUCT_SOONG_NAMESPACES += \
|
||||
device/google/zumapro/conf/ext4
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue