From 9821e00caaf95cd3301b7c54f2ab46a2e5760545 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Tue, 18 Jul 2017 13:42:12 +0800 Subject: [PATCH 1/3] Share system properties with all GSI project with treble_system.prop Use TARGET_SYSTEM_PROP to assign a common system property file in each GSI BoardConfig.mk Bug: 62647757 Test: make and check the file system/build.prop in out folder Change-Id: Ifb3e02356869f97573a3690a6d67c2b4a9471c46 Merged-In: Ifb3e02356869f97573a3690a6d67c2b4a9471c46 (cherry picked from commit 7e101699094f130965df440ae6e1572a4ab10c08) --- target/board/generic_arm64_a/BoardConfig.mk | 3 +++ target/board/generic_arm64_ab/BoardConfig.mk | 3 +++ target/board/generic_arm64_ab/system.prop | 0 target/board/generic_arm_a/BoardConfig.mk | 3 +++ target/board/generic_arm_a/system.prop | 0 .../board/{generic_arm64_a/system.prop => treble_system.prop} | 0 6 files changed, 9 insertions(+) delete mode 100644 target/board/generic_arm64_ab/system.prop delete mode 100644 target/board/generic_arm_a/system.prop rename target/board/{generic_arm64_a/system.prop => treble_system.prop} (100%) diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk index 4ecfee614..e92f84d2c 100644 --- a/target/board/generic_arm64_a/BoardConfig.mk +++ b/target/board/generic_arm64_a/BoardConfig.mk @@ -17,6 +17,9 @@ # Common boardconfig settings for generic AOSP products targetting mobile # (phone/table) devices. +# System properties +TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop + # Bootloader is not part of generic AOSP image TARGET_NO_BOOTLOADER := true diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index d1bba3945..83e44a5f7 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -17,6 +17,9 @@ # Common boardconfig settings for generic AOSP products targetting mobile # (phone/table) devices. +# System properties +TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop + # Bootloader is not part of generic AOSP image TARGET_NO_BOOTLOADER := true diff --git a/target/board/generic_arm64_ab/system.prop b/target/board/generic_arm64_ab/system.prop deleted file mode 100644 index e69de29bb..000000000 diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk index db3e394f6..03912485a 100644 --- a/target/board/generic_arm_a/BoardConfig.mk +++ b/target/board/generic_arm_a/BoardConfig.mk @@ -17,6 +17,9 @@ # Common boardconfig settings for generic AOSP products targetting mobile # (phone/table) devices. +# System properties +TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop + # Bootloader is not part of generic AOSP image TARGET_NO_BOOTLOADER := true diff --git a/target/board/generic_arm_a/system.prop b/target/board/generic_arm_a/system.prop deleted file mode 100644 index e69de29bb..000000000 diff --git a/target/board/generic_arm64_a/system.prop b/target/board/treble_system.prop similarity index 100% rename from target/board/generic_arm64_a/system.prop rename to target/board/treble_system.prop From e572132aa63a90e5118fdf8a8a30bf40e7b6f1e6 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 30 Jun 2017 17:01:10 +0800 Subject: [PATCH 2/3] Add new product aosp_arm_ab The product is for GSI with ARM 32-bits and A/B update. Bug: 38339485 Test: Build pass Change-Id: Ifad208d2e625f30d0a3dd964d53d81257eeefabf Merged-In: Ifad208d2e625f30d0a3dd964d53d81257eeefabf (cherry picked from commit fbc4835faaf7ecacc008d12b1a8d1a04aaf27475) --- target/board/generic_arm_ab/BoardConfig.mk | 68 ++++++++++++++++++++++ target/product/AndroidProducts.mk | 1 + target/product/aosp_arm_ab.mk | 35 +++++++++++ 3 files changed, 104 insertions(+) create mode 100644 target/board/generic_arm_ab/BoardConfig.mk create mode 100644 target/product/aosp_arm_ab.mk diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk new file mode 100644 index 000000000..58d597b2f --- /dev/null +++ b/target/board/generic_arm_ab/BoardConfig.mk @@ -0,0 +1,68 @@ +# +# Copyright (C) 2017 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. +# + +# Common boardconfig settings for generic AOSP products targetting mobile +# (phone/table) devices. + +# System properties +TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop + +# Bootloader is not part of generic AOSP image +TARGET_NO_BOOTLOADER := true + +# Kernel is also not part of generic AOSP image +TARGET_NO_KERNEL := true + +# system.img is always ext4 with sparse option +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false +TARGET_USES_MKE2FS := true + +# Enable dex pre-opt to speed up initial boot +ifeq ($(HOST_OS),linux) + ifeq ($(WITH_DEXPREOPT),) + WITH_DEXPREOPT := true + WITH_DEXPREOPT_PIC := true + ifneq ($(TARGET_BUILD_VARIANT),user) + # Retain classes.dex in APK's for non-user builds + DEX_PREOPT_DEFAULT := nostripping + endif + endif +endif + +# Generic AOSP image always requires separate vendor.img +TARGET_COPY_OUT_VENDOR := vendor + +# Generic AOSP image does NOT support HWC1 +TARGET_USES_HWC2 := true + +TARGET_ARCH := arm +TARGET_ARCH_VARIANT := armv7-a-neon +TARGET_CPU_ABI := armeabi-v7a +TARGET_CPU_ABI2 := armeabi +TARGET_CPU_VARIANT := generic + +# Enable A/B update +TARGET_NO_RECOVERY := true +BOARD_BUILD_SYSTEM_ROOT_IMAGE := true + +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736 + +# TODO(b/35790399): remove when b/35790399 is fixed. +BOARD_NAND_SPARE_SIZE := 0 +BOARD_FLASH_BLOCK_SIZE := 512 + +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 285fc3930..19106e01a 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -52,6 +52,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/generic_mips.mk \ $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/aosp_arm_a.mk \ + $(LOCAL_DIR)/aosp_arm_ab.mk \ $(LOCAL_DIR)/full.mk \ $(LOCAL_DIR)/aosp_x86.mk \ $(LOCAL_DIR)/aosp_x86_arm.mk \ diff --git a/target/product/aosp_arm_ab.mk b/target/product/aosp_arm_ab.mk new file mode 100644 index 000000000..423d38fba --- /dev/null +++ b/target/product/aosp_arm_ab.mk @@ -0,0 +1,35 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/generic_arm_a/ +# system.prop. + +include build/make/target/product/treble_common.mk + +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) + +PRODUCT_NAME := aosp_arm_ab +PRODUCT_DEVICE := generic_arm_ab +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on ARM32 From e4648214e8583a86e07f39653d2ee2bf6eafa857 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Mon, 3 Jul 2017 17:34:25 +0800 Subject: [PATCH 3/3] Add new products aosp_x86_a and aosp_x86_64_a The product is for GSI with x86 64-bits and 32-bits without A/B update. Bug: 38339837 Test: Build pass and boot to home screen on 32/64-bits x86 emulator by replacing system image with GSI Change-Id: I9f956bc35ba5700900df7c2fca45bf794684a418 Merged-In: I9f956bc35ba5700900df7c2fca45bf794684a418 (cherry picked from commit 4b189c810e32fb73f0cc9085ec78379011699ab7) --- target/board/generic_x86_64_a/BoardConfig.mk | 68 ++++++++++++++++++++ target/board/generic_x86_a/BoardConfig.mk | 62 ++++++++++++++++++ target/product/AndroidProducts.mk | 2 + target/product/aosp_x86_64_a.mk | 30 +++++++++ target/product/aosp_x86_a.mk | 29 +++++++++ 5 files changed, 191 insertions(+) create mode 100644 target/board/generic_x86_64_a/BoardConfig.mk create mode 100644 target/board/generic_x86_a/BoardConfig.mk create mode 100644 target/product/aosp_x86_64_a.mk create mode 100644 target/product/aosp_x86_a.mk diff --git a/target/board/generic_x86_64_a/BoardConfig.mk b/target/board/generic_x86_64_a/BoardConfig.mk new file mode 100644 index 000000000..bd1f750e3 --- /dev/null +++ b/target/board/generic_x86_64_a/BoardConfig.mk @@ -0,0 +1,68 @@ +# +# Copyright (C) 2017 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. +# + +# Common boardconfig settings for generic AOSP products targetting mobile +# (phone/table) devices. + +# System properties +TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop + +# Bootloader is not part of generic AOSP image +TARGET_NO_BOOTLOADER := true + +# Kernel is also not part of generic AOSP image +TARGET_NO_KERNEL := true + +# system.img is always ext4 with sparse option +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false +TARGET_USES_MKE2FS := true + +# Enable dex pre-opt to speed up initial boot +ifeq ($(HOST_OS),linux) + ifeq ($(WITH_DEXPREOPT),) + WITH_DEXPREOPT := true + WITH_DEXPREOPT_PIC := true + ifneq ($(TARGET_BUILD_VARIANT),user) + # Retain classes.dex in APK's for non-user builds + DEX_PREOPT_DEFAULT := nostripping + endif + endif +endif + +# Generic AOSP image always requires separate vendor.img +TARGET_COPY_OUT_VENDOR := vendor + +# Generic AOSP image does NOT support HWC1 +TARGET_USES_HWC2 := true + +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 + +TARGET_USES_64_BIT_BINDER := true + +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736 # 1.5 GB + +# TODO(b/35790399): remove when b/35790399 is fixed. +BOARD_NAND_SPARE_SIZE := 0 +BOARD_FLASH_BLOCK_SIZE := 512 + +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/target/board/generic_x86_a/BoardConfig.mk b/target/board/generic_x86_a/BoardConfig.mk new file mode 100644 index 000000000..4ca6ebe86 --- /dev/null +++ b/target/board/generic_x86_a/BoardConfig.mk @@ -0,0 +1,62 @@ +# +# Copyright (C) 2017 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. +# + +# Common boardconfig settings for generic AOSP products targetting mobile +# (phone/table) devices. + +# System properties +TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop + +# Bootloader is not part of generic AOSP image +TARGET_NO_BOOTLOADER := true + +# Kernel is also not part of generic AOSP image +TARGET_NO_KERNEL := true + +# system.img is always ext4 with sparse option +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false +TARGET_USES_MKE2FS := true + +# Enable dex pre-opt to speed up initial boot +ifeq ($(HOST_OS),linux) + ifeq ($(WITH_DEXPREOPT),) + WITH_DEXPREOPT := true + WITH_DEXPREOPT_PIC := true + ifneq ($(TARGET_BUILD_VARIANT),user) + # Retain classes.dex in APK's for non-user builds + DEX_PREOPT_DEFAULT := nostripping + endif + endif +endif + +# Generic AOSP image always requires separate vendor.img +TARGET_COPY_OUT_VENDOR := vendor + +# Generic AOSP image does NOT support HWC1 +TARGET_USES_HWC2 := true + +TARGET_CPU_ABI := x86 +TARGET_ARCH := x86 +TARGET_ARCH_VARIANT := x86 + +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736 # 1.5 GB + +# TODO(b/35790399): remove when b/35790399 is fixed. +BOARD_NAND_SPARE_SIZE := 0 +BOARD_FLASH_BLOCK_SIZE := 512 + +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 19106e01a..b95a28687 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -55,6 +55,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_arm_ab.mk \ $(LOCAL_DIR)/full.mk \ $(LOCAL_DIR)/aosp_x86.mk \ + $(LOCAL_DIR)/aosp_x86_a.mk \ $(LOCAL_DIR)/aosp_x86_arm.mk \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/aosp_mips.mk \ @@ -64,6 +65,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_arm64_ab.mk \ $(LOCAL_DIR)/aosp_mips64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ + $(LOCAL_DIR)/aosp_x86_64_a.mk \ $(LOCAL_DIR)/sdk_phone_armv7.mk \ $(LOCAL_DIR)/sdk_phone_x86.mk \ $(LOCAL_DIR)/sdk_phone_mips.mk \ diff --git a/target/product/aosp_x86_64_a.mk b/target/product/aosp_x86_64_a.mk new file mode 100644 index 000000000..eab8b4abe --- /dev/null +++ b/target/product/aosp_x86_64_a.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/generic_arm64_a/ +# system.prop. + +include build/make/target/product/treble_common.mk + +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) + +PRODUCT_NAME := aosp_x86_64_a +PRODUCT_DEVICE := generic_x86_64_a +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on x86_64 diff --git a/target/product/aosp_x86_a.mk b/target/product/aosp_x86_a.mk new file mode 100644 index 000000000..df8410730 --- /dev/null +++ b/target/product/aosp_x86_a.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2017 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. +# + +# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# /vendor/[build|default].prop when build split is on. In order to have sysprops +# on the generic system image, place them in build/make/target/board/generic_arm64_a/ +# system.prop. + +include build/make/target/product/treble_common.mk + +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) + +PRODUCT_NAME := aosp_x86_a +PRODUCT_DEVICE := generic_x86_a +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on x86