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

Commit 91c46880 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Add some experimental mainline targets." into stage-aosp-master 

am: c74d03ed

Change-Id: Ic85dbb05e5e1c23d689487fc34f6eef51f01cb10
parents ef8690b7 c74d03ed

target/board/generic/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ BOARD_USES_GENERIC_AUDIO := true 
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)



TARGET_USES_64_BIT_BINDER := true

TARGET_USES_MKE2FS := true



# no hardware camera

USE_CAMERA_STUB := true

target/board/generic_arm64/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ endif 




TARGET_USES_64_BIT_BINDER := true

TARGET_USES_MKE2FS := true



# no hardware camera

USE_CAMERA_STUB := true

target/board/generic_x86/BoardConfig.mk

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

#

TARGET_USES_64_BIT_BINDER := true

TARGET_USES_MKE2FS := true



# The IA emulator (qemu) uses the Goldfish devices

HAVE_HTC_AUDIO_DRIVER := true

target/board/generic_x86_64/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ TARGET_2ND_ARCH := x86 
TARGET_2ND_ARCH_VARIANT := x86_64



TARGET_USES_64_BIT_BINDER := true

TARGET_USES_MKE2FS := true



# The IA emulator (qemu) uses the Goldfish devices

HAVE_HTC_AUDIO_DRIVER := true

target/product/AndroidProducts.mk

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/full_x86.mk \

    $(LOCAL_DIR)/generic.mk \

    $(LOCAL_DIR)/generic_x86.mk \

    $(LOCAL_DIR)/mainline_arm64.mk \

    $(LOCAL_DIR)/mainline_system_arm64.mk \

    $(LOCAL_DIR)/sdk_arm64.mk \

    $(LOCAL_DIR)/sdk.mk \

    $(LOCAL_DIR)/sdk_phone_arm64.mk \