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

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

Merge "Add board name for emulator" am: 39acbe64

am: 0547230a

Change-Id: Ia998564a709841a7ab162891164f73aea639b7d4
parents 0aeef2a0 0547230a
Loading
Loading
Loading
Loading
+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
+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
+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
#
+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