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

Commit 12b5395c authored by Yahan Zhou's avatar Yahan Zhou
Browse files

Add board name for emulator 

VTS checks for ro.product.board before running. Emulator does not have
that value and causes an exception.

So let's add it to the emulator and call it goldfish_$(TARGET_ARCH).

BUG: 73741117
Test: vts-tradefed run vts, should run the tests
Change-Id: I6b00f2923bc9609d4d05c45d47ceddd2bd7be091
parent e752292f

target/board/generic/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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)



# no hardware camera

USE_CAMERA_STUB := true

target/board/generic_arm64/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 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

target/board/generic_x86/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 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/board/generic_x86_64/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 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