Refactor BoardConfig.mk for emulator products (510b76d8) · Commits · e / os / android_build

target/board/BoardConfigEmuCommon.mk

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		# BoardConfigEmuCommon.mk
		#
		# Common compile-time definitions for emulator
		#

		# The generic product target doesn't have any hardware-specific pieces.
		TARGET_NO_BOOTLOADER := true
		TARGET_NO_KERNEL := true

		HAVE_HTC_AUDIO_DRIVER := true
		BOARD_USES_GENERIC_AUDIO := true
		TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)

		TARGET_USES_64_BIT_BINDER := true
		TARGET_USES_MKE2FS := true

		# no hardware camera
		USE_CAMERA_STUB := true

		TARGET_USES_HWC2 := true
		NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

		# Build OpenGLES emulation guest and host libraries
		BUILD_EMULATOR_OPENGL := true
		BUILD_QEMU_IMAGES := true

		# Build and enable the OpenGL ES View renderer. When running on the emulator,
		# the GLES renderer disables itself if host GL acceleration isn't available.
		USE_OPENGL_RENDERER := true

		TARGET_COPY_OUT_VENDOR := vendor
		# ~100 MB vendor image. Please adjust system image / vendor image sizes
		# when finalizing them.
		BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000
		BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_FLASH_BLOCK_SIZE := 512
		TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
		DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml

		# Android generic system image always create metadata partition
		BOARD_USES_METADATA_PARTITION := true

		# Set this to create /cache mount point for non-A/B devices that mounts /cache.
		# The partition size doesn't matter, just to make build pass.
		BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

		BUILD_BROKEN_DUP_RULES := false

target/board/BoardConfigGsiCommon.mk

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		# BoardConfigGsiCommon.mk
		#
		# Common compile-time definitions for GSI
		#

		# Android Verified Boot (AVB):
		# Builds a special vbmeta.img that disables AVB verification.
		# Otherwise, AVB will prevent the device from booting the generic system.img.
		# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
		# metadata into system.img.
		ifeq ($(BOARD_AVB_ENABLE),true)
		$(error BOARD_AVB_ENABLE cannot be set for GSI)
		endif
		BOARD_BUILD_DISABLED_VBMETAIMAGE := true

		ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
		# GSI is always userdebug and needs a couple of properties taking precedence
		# over those set by the vendor.
		TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
		endif
		BOARD_VNDK_VERSION := current

		# Pi GSI supports system-as-root
		TARGET_NO_RECOVERY := true
		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

target/board/generic/BoardConfig.mk

+15 −68

Original line number	Diff line number	Diff line
		# config.mk
		# Copyright (C) 2018 The Android Open Source Project
		#
		# Product-specific compile-time definitions.
		# 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.
		#

		# The generic product target doesn't have any hardware-specific pieces.
		TARGET_NO_BOOTLOADER := true
		TARGET_NO_KERNEL := true
		# arm emulator specific definitions
		TARGET_ARCH := arm

		# Note: Before Pi, we built the platform images for ARMv7-A _without_ NEON.
		@@ -36,67 +44,14 @@ endif
		TARGET_CPU_VARIANT := generic
		TARGET_CPU_ABI := armeabi-v7a
		TARGET_CPU_ABI2 := armeabi
		HAVE_HTC_AUDIO_DRIVER := true
		BOARD_USES_GENERIC_AUDIO := true
		TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)

		TARGET_USES_64_BIT_BINDER := true
		TARGET_USES_MKE2FS := true

		# no hardware camera
		USE_CAMERA_STUB := true

		TARGET_USES_HWC2 := true
		NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

		# Build OpenGLES emulation guest and host libraries
		BUILD_EMULATOR_OPENGL := true
		BUILD_QEMU_IMAGES := true

		# Build and enable the OpenGL ES View renderer. When running on the emulator,
		# the GLES renderer disables itself if host GL acceleration isn't available.
		USE_OPENGL_RENDERER := true
		include build/make/target/board/BoardConfigEmuCommon.mk
		include build/make/target/board/BoardConfigGsiCommon.mk

		TARGET_USERIMAGES_USE_EXT4 := true
		# Partition size is default 1.5GB (1536MB) for 64 bits projects
		BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
		TARGET_COPY_OUT_VENDOR := vendor
		# ~100 MB vendor image. Please adjust system image / vendor image sizes
		# when finalizing them.
		BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000
		BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_FLASH_BLOCK_SIZE := 512
		TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
		DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml

		# Android generic system image always create metadata partition
		BOARD_USES_METADATA_PARTITION := true

		# Set this to create /cache mount point for non-A/B devices that mounts /cache.
		# The partition size doesn't matter, just to make build pass.
		BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

		# Android Verified Boot (AVB):
		# Builds a special vbmeta.img that disables AVB verification.
		# Otherwise, AVB will prevent the device from booting the generic system.img.
		# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
		# metadata into system.img.
		ifeq ($(BOARD_AVB_ENABLE),true)
		$(error BOARD_AVB_ENABLE cannot be set for GSI)
		endif
		BOARD_BUILD_DISABLED_VBMETAIMAGE := true

		ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
		# GSI is always userdebug and needs a couple of properties taking precedence
		# over those set by the vendor.
		TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
		endif
		BOARD_VNDK_VERSION := current

		# Wifi.
		BOARD_WLAN_DEVICE := emulator
		@@ -108,11 +63,3 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
		WIFI_DRIVER_FW_PATH_PARAM := "/dev/null"
		WIFI_DRIVER_FW_PATH_STA := "/dev/null"
		WIFI_DRIVER_FW_PATH_AP := "/dev/null"

		# Enable A/B update
		TARGET_NO_RECOVERY := true
		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

		BOARD_VNDK_VERSION := current

		BUILD_BROKEN_DUP_RULES := false

target/board/generic_arm64/BoardConfig.mk

+4 −66

Original line number	Diff line number	Diff line
		# Copyright (C) 2013 The Android Open Source Project
		# Copyright (C) 2018 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.
		@@ -13,14 +13,11 @@
		# limitations under the License.
		#

		# The generic product target doesn't have any hardware-specific pieces.
		TARGET_NO_BOOTLOADER := true
		TARGET_NO_KERNEL := true
		# arm64 emulator specific definitions
		TARGET_ARCH := arm64
		TARGET_ARCH_VARIANT := armv8-a
		TARGET_CPU_VARIANT := generic
		TARGET_CPU_ABI := arm64-v8a
		TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)

		TARGET_2ND_ARCH := arm
		TARGET_2ND_CPU_ABI := armeabi-v7a
		@@ -55,64 +52,13 @@ TARGET_2ND_ARCH_VARIANT := armv8-a
		TARGET_2ND_CPU_VARIANT := generic
		endif


		TARGET_USES_64_BIT_BINDER := true
		TARGET_USES_MKE2FS := true

		# no hardware camera
		USE_CAMERA_STUB := true

		TARGET_USES_HWC2 := true
		NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

		# Build OpenGLES emulation host and guest libraries
		BUILD_EMULATOR_OPENGL := true
		BUILD_QEMU_IMAGES := true

		# Build and enable the OpenGL ES View renderer. When running on the emulator,
		# the GLES renderer disables itself if host GL acceleration isn't available.
		USE_OPENGL_RENDERER := true
		include build/make/target/board/BoardConfigEmuCommon.mk
		include build/make/target/board/BoardConfigGsiCommon.mk

		TARGET_USERIMAGES_USE_EXT4 := true
		# Partition size is default 1.5GB (1536MB) for 64 bits projects
		BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
		TARGET_COPY_OUT_VENDOR := vendor
		# ~100 MB vendor image. Please adjust system image / vendor image sizes
		# when finalizing them.
		BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000
		BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_FLASH_BLOCK_SIZE := 512
		TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
		DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml

		# Android generic system image always create metadata partition
		BOARD_USES_METADATA_PARTITION := true

		# Set this to create /cache mount point for non-A/B devices that mounts /cache.
		# The partition size doesn't matter, just to make build pass.
		BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
		BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common

		# Android Verified Boot (AVB):
		# Builds a special vbmeta.img that disables AVB verification.
		# Otherwise, AVB will prevent the device from booting the generic system.img.
		# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
		# metadata into system.img.
		ifeq ($(BOARD_AVB_ENABLE),true)
		$(error BOARD_AVB_ENABLE cannot be set for GSI)
		endif
		BOARD_BUILD_DISABLED_VBMETAIMAGE := true

		ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
		# GSI is always userdebug and needs a couple of properties taking precedence
		# over those set by the vendor.
		TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
		endif
		BOARD_VNDK_VERSION := current

		# Emulator system image is going to be used as GSI and some vendor still hasn't
		# cleaned up all device specific directories under root!
		@@ -135,11 +81,3 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
		WIFI_DRIVER_FW_PATH_PARAM := "/dev/null"
		WIFI_DRIVER_FW_PATH_STA := "/dev/null"
		WIFI_DRIVER_FW_PATH_AP := "/dev/null"

		# Enable A/B update
		TARGET_NO_RECOVERY := true
		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

		BOARD_VNDK_VERSION := current

		BUILD_BROKEN_DUP_RULES := false

target/board/generic_x86/BoardConfig.mk

+17 −81

Original line number	Diff line number	Diff line
		# config.mk
		# Copyright (C) 2018 The Android Open Source Project
		#
		# Product-specific compile-time definitions.
		# 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.
		#

		# The generic product target doesn't have any hardware-specific pieces.
		TARGET_NO_BOOTLOADER := true
		TARGET_NO_KERNEL := true
		# x86 emulator specific definitions
		TARGET_CPU_ABI := x86
		TARGET_ARCH := x86
		TARGET_ARCH_VARIANT := x86
		TARGET_PRELINK_MODULE := false
		TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)

		#emulator now uses 64bit kernel to run 32bit x86 image
		#
		TARGET_USES_64_BIT_BINDER := true
		TARGET_USES_MKE2FS := true

		# The IA emulator (qemu) uses the Goldfish devices
		HAVE_HTC_AUDIO_DRIVER := true
		BOARD_USES_GENERIC_AUDIO := true

		# no hardware camera
		USE_CAMERA_STUB := true

		# Enable dex-preoptimization to speed up the first boot sequence
		# of an SDK AVD. Note that this operation only works on Linux for now
		ifeq ($(HOST_OS),linux)
		WITH_DEXPREOPT ?= true
		WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= false
		endif

		TARGET_USES_HWC2 := true
		NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

		# Build OpenGLES emulation host and guest libraries
		BUILD_EMULATOR_OPENGL := true

		# Build partitioned system.img and vendor.img (if applicable)
		# for qemu, otherwise, init cannot find PART_NAME
		BUILD_QEMU_IMAGES := true
		TARGET_PRELINK_MODULE := false

		# Build and enable the OpenGL ES View renderer. When running on the emulator,
		# the GLES renderer disables itself if host GL acceleration isn't available.
		USE_OPENGL_RENDERER := true
		include build/make/target/board/BoardConfigEmuCommon.mk
		include build/make/target/board/BoardConfigGsiCommon.mk

		TARGET_USERIMAGES_USE_EXT4 := true
		BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
		# Resize to 4G to accomodate ASAN and CTS
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296
		TARGET_COPY_OUT_VENDOR := vendor
		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
		# ~100 MB vendor image. Please adjust system image / vendor image sizes
		# when finalizing them.
		BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000
		BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_FLASH_BLOCK_SIZE := 512
		TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
		DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml

		# Android generic system image always create metadata partition
		BOARD_USES_METADATA_PARTITION := true

		# Set this to create /cache mount point for non-A/B devices that mounts /cache.
		# The partition size doesn't matter, just to make build pass.
		BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		BOARD_SEPOLICY_DIRS += \
		device/generic/goldfish/sepolicy/common \
		device/generic/goldfish/sepolicy/x86

		# Android Verified Boot (AVB):
		# Builds a special vbmeta.img that disables AVB verification.
		# Otherwise, AVB will prevent the device from booting the generic system.img.
		# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
		# metadata into system.img.
		ifeq ($(BOARD_AVB_ENABLE),true)
		$(error BOARD_AVB_ENABLE cannot be set for GSI)
		endif
		BOARD_BUILD_DISABLED_VBMETAIMAGE := true

		ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
		# GSI is always userdebug and needs a couple of properties taking precedence
		# over those set by the vendor.
		TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
		endif
		BOARD_VNDK_VERSION := current

		BUILD_BROKEN_DUP_RULES := false

		# Enable A/B update
		TARGET_NO_RECOVERY := true
		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
		BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86

		# Wifi.
		BOARD_WLAN_DEVICE := emulator