From db38b8ae62416a17e0bc14aa8798766a5534526a Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Wed, 20 Nov 2019 17:47:11 +0800 Subject: [PATCH] Add mainline_system_x86_64 product Bug: 141972143 Test: lunch mainline_system_x86_64-userdebug; m Change-Id: I9ff5fc9d9a873d49008675b5907eb62872712200 --- target/board/mainline_x86_64/BoardConfig.mk | 35 ++++++++++++++++ target/product/AndroidProducts.mk | 1 + target/product/mainline_system_x86_64.mk | 46 +++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 target/board/mainline_x86_64/BoardConfig.mk create mode 100644 target/product/mainline_system_x86_64.mk diff --git a/target/board/mainline_x86_64/BoardConfig.mk b/target/board/mainline_x86_64/BoardConfig.mk new file mode 100644 index 000000000..118fda61e --- /dev/null +++ b/target/board/mainline_x86_64/BoardConfig.mk @@ -0,0 +1,35 @@ +# +# Copyright (C) 2019 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 := x86_64 +TARGET_ARCH_VARIANT := x86_64 +TARGET_CPU_ABI := x86_64 + +TARGET_2ND_ARCH := x86 +TARGET_2ND_ARCH_VARIANT := x86_64 +TARGET_2ND_CPU_ABI := x86 + +include build/make/target/board/BoardConfigMainlineCommon.mk + +TARGET_NO_KERNEL := true + +# Build generic A/B format system-only OTA. +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system + +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index ca4ed2c95..5ecaf2626 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -57,6 +57,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mainline_system_arm64.mk \ $(LOCAL_DIR)/mainline_system_x86.mk \ $(LOCAL_DIR)/mainline_system_x86_arm.mk \ + $(LOCAL_DIR)/mainline_system_x86_64.mk \ $(LOCAL_DIR)/sdk_arm64.mk \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sdk_phone_arm64.mk \ diff --git a/target/product/mainline_system_x86_64.mk b/target/product/mainline_system_x86_64.mk new file mode 100644 index 000000000..1b1a42fe5 --- /dev/null +++ b/target/product/mainline_system_x86_64.mk @@ -0,0 +1,46 @@ +# +# Copyright (C) 2019 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. +# + +# +# All components inherited here go to system image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) +$(call enforce-product-packages-exist,) + +# Enable mainline checking +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true + +# Enable nonflat APEX +$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) + +PRODUCT_BUILD_CACHE_IMAGE := false +PRODUCT_BUILD_ODM_IMAGE := false +PRODUCT_BUILD_PRODUCT_IMAGE := false +PRODUCT_BUILD_RAMDISK_IMAGE := false +PRODUCT_BUILD_SYSTEM_IMAGE := true +PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false +PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false +PRODUCT_BUILD_USERDATA_IMAGE := false +PRODUCT_BUILD_VENDOR_IMAGE := false + +PRODUCT_SHIPPING_API_LEVEL := 29 + +PRODUCT_RESTRICT_VENDOR_FILES := all + +PRODUCT_NAME := mainline_system_x86_64 +PRODUCT_DEVICE := mainline_x86_64 +PRODUCT_BRAND := generic