diff options
| author | Yahan Zhou <yahan@google.com> | 2018-02-21 15:41:51 -0800 |
|---|---|---|
| committer | Yahan Zhou <yahan@google.com> | 2018-02-27 18:11:48 -0800 |
| commit | 12b5395c2fbca16fdec3d85b458a7b3e793c8b33 (patch) | |
| tree | 6b01f11195874893c8b96ca25e4e9fdecec9fedd | |
| parent | e752292f26c5cf0558bc306e49daff11d904447f (diff) | |
| download | build-12b5395c2fbca16fdec3d85b458a7b3e793c8b33.tar.gz | |
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
| -rw-r--r-- | target/board/generic/BoardConfig.mk | 1 | ||||
| -rw-r--r-- | target/board/generic_arm64/BoardConfig.mk | 1 | ||||
| -rw-r--r-- | target/board/generic_x86/BoardConfig.mk | 1 | ||||
| -rwxr-xr-x | target/board/generic_x86_64/BoardConfig.mk | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 8d93f75190..67d019f0a1 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -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 diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 9d2ccbd982..e066e3a879 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -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 diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index a73a31b16d..f71e72b95d 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -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 # diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index aea1a0aa25..a9c5142049 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -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 |