Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a2a7a77 authored by SzuWei Lin's avatar SzuWei Lin Committed by android-build-merger
Browse files

Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev 

am: 76a09778

Change-Id: I3e5db03c6eb50b7e4cd22c0ee17a6b4ff75a7e0c
parents 78a11ff5 76a09778

target/board/generic_x86_64_ab/BoardConfig.mk

0 → 100644
+71 −0
Original line number Diff line number Diff line 
#

# 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



# Enable A/B update

BOARD_BUILD_SYSTEM_ROOT_IMAGE := 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

target/board/generic_x86_ab/BoardConfig.mk

0 → 100644
+65 −0
Original line number Diff line number Diff line 
#

# 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



# Enable A/B update

BOARD_BUILD_SYSTEM_ROOT_IMAGE := 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

target/product/AndroidProducts.mk

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/full.mk \

    $(LOCAL_DIR)/aosp_x86.mk \

    $(LOCAL_DIR)/aosp_x86_a.mk \

    $(LOCAL_DIR)/aosp_x86_ab.mk \

    $(LOCAL_DIR)/aosp_x86_arm.mk \

    $(LOCAL_DIR)/full_x86.mk \

    $(LOCAL_DIR)/aosp_mips.mk \
@@ -66,6 +67,7 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/aosp_mips64.mk \

    $(LOCAL_DIR)/aosp_x86_64.mk \

    $(LOCAL_DIR)/aosp_x86_64_a.mk \

    $(LOCAL_DIR)/aosp_x86_64_ab.mk \

    $(LOCAL_DIR)/sdk_phone_armv7.mk \

    $(LOCAL_DIR)/sdk_phone_x86.mk \

    $(LOCAL_DIR)/sdk_phone_mips.mk \

target/product/aosp_x86_64_ab.mk

0 → 100644
+36 −0
Original line number Diff line number Diff line 
#

# 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



AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



$(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_ab

PRODUCT_DEVICE := generic_x86_64_ab

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on x86_64

target/product/aosp_x86_ab.mk

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#

# 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



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_x86_ab

PRODUCT_DEVICE := generic_x86_ab

PRODUCT_BRAND := Android

PRODUCT_MODEL := AOSP on x86