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

Commit 0547230a authored by Yahan Zhou's avatar Yahan Zhou Committed by android-build-merger
Browse files

Merge "Add board name for emulator"

am: 39acbe64

Change-Id: I19e28922d77bfe3eab29091b8d72a5cdfae39fe3
parents cf9d0cf4 39acbe64
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
TARGET_CPU_ABI2 := armeabi
HAVE_HTC_AUDIO_DRIVER := true
HAVE_HTC_AUDIO_DRIVER := true
BOARD_USES_GENERIC_AUDIO := true
BOARD_USES_GENERIC_AUDIO := true
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)


# no hardware camera
# no hardware camera
USE_CAMERA_STUB := true
USE_CAMERA_STUB := true
+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ TARGET_ARCH := arm64
TARGET_ARCH_VARIANT := armv8-a
TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_VARIANT := generic
TARGET_CPU_VARIANT := generic
TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_ABI := arm64-v8a
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)


TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH := arm
TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI := armeabi-v7a
+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ TARGET_CPU_ABI := x86
TARGET_ARCH := x86
TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86
TARGET_ARCH_VARIANT := x86
TARGET_PRELINK_MODULE := false
TARGET_PRELINK_MODULE := false
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)


#emulator now uses 64bit kernel to run 32bit x86 image
#emulator now uses 64bit kernel to run 32bit x86 image
#
#
+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ TARGET_CPU_ABI := x86_64
TARGET_ARCH := x86_64
TARGET_ARCH := x86_64
TARGET_ARCH_VARIANT := x86_64
TARGET_ARCH_VARIANT := x86_64
TARGET_PRELINK_MODULE := false
TARGET_PRELINK_MODULE := false
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)


TARGET_2ND_CPU_ABI := x86
TARGET_2ND_CPU_ABI := x86
TARGET_2ND_ARCH := x86
TARGET_2ND_ARCH := x86