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

Commit f10efbc1 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "make 64-bit builds into multiarch builds"

parents 5c7039fb 930b5fbc

target/board/generic_arm64/BoardConfig.mk

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ TARGET_ARCH_VARIANT := armv8-a 
TARGET_CPU_VARIANT := generic

TARGET_CPU_ABI := arm64-v8a



TARGET_2ND_ARCH := arm

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

TARGET_2ND_CPU_VARIANT := generic

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi



TARGET_USES_64_BIT_BINDER := true



# no hardware camera

USE_CAMERA_STUB := true

target/board/generic_mips64/BoardConfig.mk

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ TARGET_ARCH_VARIANT := mips64r2 
endif

TARGET_CPU_ABI  := mips64



TARGET_2ND_ARCH := mips

ifeq (,$(TARGET_2ND_ARCH_VARIANT))

TARGET_2ND_ARCH_VARIANT :=  mips32r2-fp

endif

TARGET_CPU_ABI  := mips



# The emulator (qemu) uses the Goldfish devices

HAVE_HTC_AUDIO_DRIVER := true

BOARD_USES_GENERIC_AUDIO := true

target/board/generic_x86_64/BoardConfig.mk

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ TARGET_ARCH := x86_64 
TARGET_ARCH_VARIANT := x86_64

TARGET_PRELINK_MODULE := false



TARGET_2ND_CPU_ABI := x86

TARGET_2ND_ARCH := x86

TARGET_2ND_ARCH_VARIANT := x86



TARGET_USES_64_BIT_BINDER := true



# The IA emulator (qemu) uses the Goldfish devices

HAVE_HTC_AUDIO_DRIVER := true

BOARD_USES_GENERIC_AUDIO := true

target/product/aosp_arm64.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)



PRODUCT_RUNTIMES := runtime_libart_default



include $(SRC_TARGET_DIR)/product/emulator.mk

PRODUCT_NAME := aosp_arm64

PRODUCT_DEVICE := generic_arm64

target/product/full_mips64.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips64/device.mk)



PRODUCT_RUNTIMES := runtime_libart_default



include $(SRC_TARGET_DIR)/product/emulator.mk



# Overrides