commit 8b468c14ab84f8edfa1879d42f55ba36215ef0e6
author Treehugger Robot <treehugger-gerrit@google.com> Sat Sep 07 01:43:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 07 01:43:50 2019 +0000
tree 273f0d49e5f02ad58bbf78c7d8aa3c483aa2cba5
parent 6b5481fa5ee659088d1b4fc3a74dc920aab139e1
parent 05f73f0b1910c35ea51aa394267df7a442dd1f52

Merge "Update generic_x86_arm for native bridge support"

target/board/generic_x86_arm/BoardConfig.mk

diff --git a/target/board/generic_x86_arm/BoardConfig.mk b/target/board/generic_x86_arm/BoardConfig.mk
index 6fae411..e879001 100644
--- a/target/board/generic_x86_arm/BoardConfig.mk
+++ b/target/board/generic_x86_arm/BoardConfig.mk
@@ -18,14 +18,10 @@
 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