From 05f73f0b1910c35ea51aa394267df7a442dd1f52 Mon Sep 17 00:00:00 2001 From: bohu Date: Fri, 6 Sep 2019 13:11:41 -0700 Subject: [PATCH] Update generic_x86_arm for native bridge support BUG: 140623928 Change-Id: I5ea205576393f66421b4edea192d1de9f3249c06 --- target/board/generic_x86_arm/BoardConfig.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/target/board/generic_x86_arm/BoardConfig.mk b/target/board/generic_x86_arm/BoardConfig.mk index 6fae4113c..e87900158 100644 --- a/target/board/generic_x86_arm/BoardConfig.mk +++ b/target/board/generic_x86_arm/BoardConfig.mk @@ -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