diff options
Diffstat (limited to 'target/board/generic_x86_arm/BoardConfig.mk')
| -rw-r--r-- | target/board/generic_x86_arm/BoardConfig.mk | 54 |
1 files changed, 20 insertions, 34 deletions
diff --git a/target/board/generic_x86_arm/BoardConfig.mk b/target/board/generic_x86_arm/BoardConfig.mk index c66aacc844..6fae4113c1 100644 --- a/target/board/generic_x86_arm/BoardConfig.mk +++ b/target/board/generic_x86_arm/BoardConfig.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2016 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,11 +13,7 @@ # limitations under the License. # -# Configuration for generic_x86 + arm libraries needed by binary translation. - -# 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 @@ -25,40 +21,30 @@ TARGET_ARCH_VARIANT := x86 TARGET_2ND_ARCH := arm TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_ARCH_VARIANT := armv7-a +TARGET_2ND_ARCH_VARIANT := armv7-a-neon TARGET_2ND_CPU_VARIANT := generic -# Tell the build system this isn't a typical 64bit+32bit multilib configuration. +TARGET_CPU_ABI_LIST := x86 armeabi-v7a armeabi TARGET_TRANSLATE_2ND_ARCH := 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) - ifeq ($(WITH_DEXPREOPT),) - WITH_DEXPREOPT := true - WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false - endif -endif +BUILD_BROKEN_DUP_RULES := true -TARGET_USES_HWC2 := true -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 -# Build OpenGLES emulation host and guest libraries -BUILD_EMULATOR_OPENGL := true +include build/make/target/board/BoardConfigGsiCommon.mk +include build/make/target/board/BoardConfigEmuCommon.mk -# 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 +# Resize to 4G to accomodate ASAN and CTS +BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 -TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1879048192 # 1.75 GB -BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 -BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_FLASH_BLOCK_SIZE := 512 -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86 -BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common +# Wifi. +BOARD_WLAN_DEVICE := emulator +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_simulated +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated +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" |