diff options
author | Yi-Yo Chiang <yochiang@google.com> | 2023-11-24 14:02:23 +0800 |
---|---|---|
committer | Yi-Yo Chiang <yochiang@google.com> | 2023-11-24 14:06:55 +0800 |
commit | 88cfa26a8de28919be122143e52596152ec8cb4d (patch) | |
tree | 76defe04bdb8ed22607dcd845e86938bc2574c10 | |
parent | dc48eb6a6176f5c62cd79b2116cfbd04c079f094 (diff) | |
download | common-88cfa26a8de28919be122143e52596152ec8cb4d.tar.gz |
Deprecate gki_* targets from 'main'
We no longer build these targets from the main branch.
Instead GKIs are now built from their own unbundled branches.
Remove these unused makefiles so we can clean up stale build rules.
Bug: 308714640
Bug: 229701033
Test: presubmit
Change-Id: Ieabcef52fe9bee77cb7a18ab2e89ab66081ae395
-rw-r--r-- | AndroidProducts.mk | 3 | ||||
-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 |
8 files changed, 0 insertions, 339 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/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 |