Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36efa am: f9915e1328

Original change: https://android-review.googlesource.com/c/platform/build/+/2506000

Change-Id: I2d7079d6e84d4b0c41ecf151289c5f5a19b316f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-24 22:48:26 +00:00
committed by Automerger Merge Worker

View File

@@ -17,7 +17,11 @@
# (device) target architectures are irrelevant. However, the build system isn't # (device) target architectures are irrelevant. However, the build system isn't
# prepared to handle no target architectures at all, so pick something # prepared to handle no target architectures at all, so pick something
# arbitrarily. # arbitrarily.
TARGET_ARCH_SUITE := ndk TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon
TARGET_CPU_VARIANT := generic
TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
HOST_CROSS_OS := linux_bionic HOST_CROSS_OS := linux_bionic
HOST_CROSS_ARCH := x86_64 HOST_CROSS_ARCH := x86_64