Switch cf_x86_phone to NATIVE_BRIDGE
This change switches cf_x86_phone to new native_bridge support
from build system. NATIVE_BRIDGE_* properties allow us to build
up to 2 translated architectures and solve the problem with
having native_bridge build support on x86_64 products.
Bug: http://b/77159578
Test: make
Change-Id: Ic7496e942c476c6f219ac0629f4eabafe62b44e7
(cherry picked from commit 96f189eedf95e7a16896ea7c850a89d25e77dab8)
diff --git a/vsoc_x86/BoardConfig.mk b/vsoc_x86/BoardConfig.mk
index 68b1e63..9c7001a 100644
--- a/vsoc_x86/BoardConfig.mk
+++ b/vsoc_x86/BoardConfig.mk
@@ -23,12 +23,11 @@
TARGET_BOARD_PLATFORM := vsoc_x86
TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86
-TARGET_2ND_ARCH := arm
-TARGET_TRANSLATE_2ND_ARCH := true
TARGET_CPU_ABI := x86
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_VARIANT := generic
+
+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