Merge "Update generic_x86_arm for native bridge support" am: 8b468c14ab

am: 9d269381f3

Change-Id: I341843b88ac86f15d108735caed5930cc44f32f4
This commit is contained in:
bohu 2019-09-06 19:16:40 -07:00 committed by android-build-merger
commit 23fe1b03f2
1 changed files with 4 additions and 8 deletions

View File

@ -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