diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-29 00:23:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-29 00:23:43 +0000 |
commit | a8c6c1e0326e478e51155566e6c38117a1ba1ade (patch) | |
tree | 24f7c68d514d9de303436133be15cda88413deda | |
parent | 8d759a5865c1ac73ae3fe348b636004071d10886 (diff) | |
parent | 9a6f23adeac16ac4441aaa1cfb120a07af0ddf81 (diff) | |
download | common-a8c6c1e0326e478e51155566e6c38117a1ba1ade.tar.gz |
Merge "Snap for 11152489 from 5b5bfd7c04ff59d5f1f36520f2ccd2af9959429c to sdk-release" into sdk-release
-rw-r--r-- | AndroidProducts.mk | 3 | ||||
-rw-r--r-- | BoardConfigGkiCommon.mk | 52 | ||||
-rw-r--r-- | gki419_arm64.mk | 49 | ||||
-rw-r--r-- | gki419_arm64/BoardConfig.mk | 44 | ||||
-rw-r--r-- | gki_arm64.mk | 57 | ||||
-rw-r--r-- | gki_arm64/BoardConfig.mk | 52 | ||||
-rw-r--r-- | gki_common.mk | 42 | ||||
-rw-r--r-- | gki_x86_64.mk | 50 | ||||
-rwxr-xr-x | gki_x86_64/BoardConfig.mk | 42 |
9 files changed, 0 insertions, 391 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 5b1b4c5..b002607 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,6 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/gki_arm64.mk \ - $(LOCAL_DIR)/gki_x86_64.mk \ - $(LOCAL_DIR)/gki419_arm64.mk \ $(LOCAL_DIR)/gsi_arm.mk \ $(LOCAL_DIR)/gsi_arm64.mk \ $(LOCAL_DIR)/gsi_x86.mk \ diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk deleted file mode 100644 index c7970d7..0000000 --- a/BoardConfigGkiCommon.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2022 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. -# - -# Enable GKI 2.0 certification -BOARD_GKI_SIGNING_KEY_PATH := build/make/target/product/gsi/testkey_rsa2048.pem -BOARD_GKI_SIGNING_ALGORITHM := SHA256_RSA2048 - -# Enable chained vbmeta for boot and init_boot images -BOARD_AVB_ENABLE := true -BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) - -BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem -BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096 -BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2 - -BOARD_AVB_INIT_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem -BOARD_AVB_INIT_BOOT_ALGORITHM := SHA256_RSA4096 -BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION := 3 - -# Sets boot SPL. -BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) - -# Boot image with kernel only (no ramdisk) -BOARD_BOOT_HEADER_VERSION := 4 -BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) -BOARD_USES_RECOVERY_AS_BOOT := -TARGET_NO_KERNEL := false -BOARD_USES_GENERIC_KERNEL_IMAGE := true -BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK ?= true - -# No system image -BOARD_SYSTEMIMAGE_PARTITION_SIZE := - -# No vendor_boot -BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := - -# No recovery -BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE := diff --git a/gki419_arm64.mk b/gki419_arm64.mk deleted file mode 100644 index 15e6038..0000000 --- a/gki419_arm64.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (C) 2022 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. -# - -# -# TODO (b/212486689): The minimum system stuff for build pass. -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) - -# -# Build GKI boot images -# -include device/generic/common/gki_common.mk - -PRODUCT_COPY_FILES += \ - kernel/prebuilts/4.19/arm64/kernel-4.19:kernel-4.19 \ - kernel/prebuilts/4.19/arm64/kernel-4.19-gz:kernel-4.19-gz \ - kernel/prebuilts/4.19/arm64/kernel-4.19-lz4:kernel-4.19-lz4 \ - -$(call dist-for-goals,dist_files,kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19/prebuilt-info.txt) - -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - kernel/prebuilts/4.19/arm64/kernel-4.19-allsyms:kernel-4.19-allsyms \ - kernel/prebuilts/4.19/arm64/kernel-4.19-gz-allsyms:kernel-4.19-gz-allsyms \ - kernel/prebuilts/4.19/arm64/kernel-4.19-lz4-allsyms:kernel-4.19-lz4-allsyms \ - -$(call dist-for-goals,dist_files,kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19-debug/prebuilt-info.txt) - -endif - - -PRODUCT_NAME := gki419_arm64 -PRODUCT_DEVICE := gki419_arm64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := GKI on ARM64 diff --git a/gki419_arm64/BoardConfig.mk b/gki419_arm64/BoardConfig.mk deleted file mode 100644 index aada36a..0000000 --- a/gki419_arm64/BoardConfig.mk +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2022 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. -# - -TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a -TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := generic - -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 := generic - -include device/generic/common/BoardConfigGkiCommon.mk - -# Boot image with ramdisk and kernel -BOARD_RAMDISK_USE_LZ4 := true -BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK := false - -BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 -BOARD_KERNEL-4.19-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 - -BOARD_KERNEL_BINARIES := \ - kernel-4.19-gz \ - -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -BOARD_KERNEL_BINARIES += \ - kernel-4.19-gz-allsyms \ - -endif diff --git a/gki_arm64.mk b/gki_arm64.mk deleted file mode 100644 index f826bb4..0000000 --- a/gki_arm64.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2022 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. -# - -# -# TODO (b/212486689): The minimum system stuff for build pass. -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) - -# -# Build GKI boot images -# -include device/generic/common/gki_common.mk - -PRODUCT_COPY_FILES += \ - kernel/prebuilts/5.10/arm64/kernel-5.10:kernel-5.10 \ - kernel/prebuilts/5.10/arm64/kernel-5.10-gz:kernel-5.10-gz \ - kernel/prebuilts/5.10/arm64/kernel-5.10-lz4:kernel-5.10-lz4 \ - kernel/prebuilts/5.15/arm64/kernel-5.15:kernel-5.15 \ - kernel/prebuilts/5.15/arm64/kernel-5.15-gz:kernel-5.15-gz \ - kernel/prebuilts/5.15/arm64/kernel-5.15-lz4:kernel-5.15-lz4 \ - -$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt) -$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt) - -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - kernel/prebuilts/5.10/arm64/kernel-5.10-allsyms:kernel-5.10-allsyms \ - kernel/prebuilts/5.10/arm64/kernel-5.10-gz-allsyms:kernel-5.10-gz-allsyms \ - kernel/prebuilts/5.10/arm64/kernel-5.10-lz4-allsyms:kernel-5.10-lz4-allsyms \ - kernel/prebuilts/5.15/arm64/kernel-5.15-allsyms:kernel-5.15-allsyms \ - kernel/prebuilts/5.15/arm64/kernel-5.15-gz-allsyms:kernel-5.15-gz-allsyms \ - kernel/prebuilts/5.15/arm64/kernel-5.15-lz4-allsyms:kernel-5.15-lz4-allsyms \ - -$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt) -$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt) - -endif - - -PRODUCT_NAME := gki_arm64 -PRODUCT_DEVICE := gki_arm64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := GKI on ARM64 diff --git a/gki_arm64/BoardConfig.mk b/gki_arm64/BoardConfig.mk deleted file mode 100644 index 224c0c0..0000000 --- a/gki_arm64/BoardConfig.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2022 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. -# - -TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a -TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := generic - -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 := generic - -include device/generic/common/BoardConfigGkiCommon.mk - -BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.10-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 -BOARD_KERNEL-5.10-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 -BOARD_KERNEL-5.10-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 -BOARD_KERNEL-5.10-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376 -BOARD_KERNEL-5.15_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.15-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.15-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 -BOARD_KERNEL-5.15-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 -BOARD_KERNEL-5.15-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 -BOARD_KERNEL-5.15-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376 - -BOARD_KERNEL_BINARIES := \ - kernel-5.10 kernel-5.10-gz kernel-5.10-lz4 \ - kernel-5.15 kernel-5.15-gz kernel-5.15-lz4 \ - -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -BOARD_KERNEL_BINARIES += \ - kernel-5.10-allsyms kernel-5.10-gz-allsyms kernel-5.10-lz4-allsyms \ - kernel-5.15-allsyms kernel-5.15-gz-allsyms kernel-5.15-lz4-allsyms \ - -endif diff --git a/gki_common.mk b/gki_common.mk deleted file mode 100644 index 42b9a6c..0000000 --- a/gki_common.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2022 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. -# - -# -# Output boot.img -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) -PRODUCT_BUILD_BOOT_IMAGE := true - -PRODUCT_BUILD_INIT_BOOT_IMAGE := false -PRODUCT_BUILD_CACHE_IMAGE := false -PRODUCT_BUILD_ODM_IMAGE := false -PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false -PRODUCT_BUILD_ODM_DLKM_IMAGE := false -PRODUCT_BUILD_PRODUCT_IMAGE := false -PRODUCT_BUILD_RAMDISK_IMAGE := true -PRODUCT_BUILD_SYSTEM_IMAGE := false -PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false -PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false -PRODUCT_BUILD_USERDATA_IMAGE := false -PRODUCT_BUILD_VENDOR_IMAGE := false -PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false -PRODUCT_BUILD_RECOVERY_IMAGE := false -PRODUCT_BUILD_VBMETA_IMAGE := false -PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false -PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE := false - -MODULE_BUILD_FROM_SOURCE := true -PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true diff --git a/gki_x86_64.mk b/gki_x86_64.mk deleted file mode 100644 index 2dc7919..0000000 --- a/gki_x86_64.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2022 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. -# - -# -# TODO (b/212486689): The minimum system stuff for build pass. -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) - -# -# Build GKI boot images -# -include device/generic/common/gki_common.mk - -PRODUCT_COPY_FILES += \ - kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10 \ - kernel/prebuilts/5.15/x86_64/kernel-5.15:kernel-5.15 \ - -$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt) -$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/x86_64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt) - -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) - -PRODUCT_COPY_FILES += \ - kernel/prebuilts/5.10/x86_64/kernel-5.10-allsyms:kernel-5.10-allsyms \ - kernel/prebuilts/5.15/x86_64/kernel-5.15-allsyms:kernel-5.15-allsyms \ - -$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt) -$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/x86_64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt) - -endif - - -PRODUCT_NAME := gki_x86_64 -PRODUCT_DEVICE := gki_x86_64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := GKI on x86_64 diff --git a/gki_x86_64/BoardConfig.mk b/gki_x86_64/BoardConfig.mk deleted file mode 100755 index 6321edc..0000000 --- a/gki_x86_64/BoardConfig.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (C) 2022 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. -# - -TARGET_CPU_ABI := x86_64 -TARGET_ARCH := x86_64 -TARGET_ARCH_VARIANT := x86_64 - -TARGET_2ND_CPU_ABI := x86 -TARGET_2ND_ARCH := x86 -TARGET_2ND_ARCH_VARIANT := x86_64 - -include device/generic/common/BoardConfigGkiCommon.mk - -BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.15_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-5.15-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 - -# Boot images -BOARD_KERNEL_BINARIES := \ - kernel-5.10 \ - kernel-5.15 \ - -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -BOARD_KERNEL_BINARIES += \ - kernel-5.10-allsyms \ - kernel-5.15-allsyms \ - -endif |