From 510b76d8ffb47cc608f8783901dd95bfcac3f0f5 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Mon, 11 Jun 2018 12:52:22 +0800 Subject: [PATCH] Refactor BoardConfig.mk for emulator products The majority of the contents in BoardConfig.mk of emulator products are the same. The common part is factored out as EmuConfig.mk so it's easier to maintain these closely related products going forward. Bug: 80117040 Test: Following products have been built and booted to homescreen: $ lunch aosp_x86-userdebug; m -j; emulator $ lunch aosp_x86_64-userdebug; m -j; emulator Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0 --- target/board/BoardConfigEmuCommon.mk | 51 +++++++++++ target/board/BoardConfigGsiCommon.mk | 25 ++++++ target/board/generic/BoardConfig.mk | 83 ++++-------------- target/board/generic_arm64/BoardConfig.mk | 70 +--------------- target/board/generic_x86/BoardConfig.mk | 98 ++++------------------ target/board/generic_x86_64/BoardConfig.mk | 93 ++++---------------- 6 files changed, 129 insertions(+), 291 deletions(-) create mode 100644 target/board/BoardConfigEmuCommon.mk create mode 100644 target/board/BoardConfigGsiCommon.mk diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk new file mode 100644 index 0000000000..1d58eabc81 --- /dev/null +++ b/target/board/BoardConfigEmuCommon.mk @@ -0,0 +1,51 @@ +# 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 diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk new file mode 100644 index 0000000000..86f5bf128e --- /dev/null +++ b/target/board/BoardConfigGsiCommon.mk @@ -0,0 +1,25 @@ +# 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 diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index fe9aed6c06..2331a48914 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -1,11 +1,19 @@ -# 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 diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 64d217b689..0cbef06da0 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -1,4 +1,4 @@ -# 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 diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 5c4cdc9982..511cd045e5 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -1,98 +1,34 @@ -# 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 - -# 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 diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 30d173de1b..b9d7e5a0d1 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -1,90 +1,37 @@ -# 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_64 emulator specific definitions TARGET_CPU_ABI := x86_64 TARGET_ARCH := x86_64 TARGET_ARCH_VARIANT := x86_64 -TARGET_PRELINK_MODULE := false -TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH) TARGET_2ND_CPU_ABI := x86 TARGET_2ND_ARCH := x86 TARGET_2ND_ARCH_VARIANT := x86_64 -TARGET_USES_64_BIT_BINDER := true -TARGET_USES_MKE2FS := true +TARGET_PRELINK_MODULE := false -# 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_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 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB 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 -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := 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 +BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86 # Wifi. BOARD_WLAN_DEVICE := emulator @@ -96,9 +43,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 - -BUILD_BROKEN_DUP_RULES := false