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

Commit 9d269381 authored by bohu's avatar bohu Committed by android-build-merger
Browse files

Merge "Update generic_x86_arm for native bridge support" 

am: 8b468c14

Change-Id: I58618475ef4d84b9868a769f6acf9a1d7086843e
parents 6fba8c39 8b468c14

target/board/generic_x86_arm/BoardConfig.mk

+4 −8
Original line number Diff line number Diff line
@@ -18,14 +18,10 @@ TARGET_CPU_ABI := x86 
TARGET_ARCH := x86

TARGET_ARCH_VARIANT := x86



TARGET_2ND_ARCH := arm

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

TARGET_2ND_CPU_VARIANT := generic



TARGET_CPU_ABI_LIST := x86 armeabi-v7a armeabi

TARGET_TRANSLATE_2ND_ARCH := true

TARGET_NATIVE_BRIDGE_ARCH := arm

TARGET_NATIVE_BRIDGE_ARCH_VARIANT := armv7-a-neon

TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic

TARGET_NATIVE_BRIDGE_ABI := armeabi-v7a armeabi



BUILD_BROKEN_DUP_RULES := true