From 5219c0e4bf5bbd9076ecd432e7567f799a291827 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 17 Jun 2021 00:33:00 +0900 Subject: [PATCH] Fix ndk and aml arch order Some codes assume that the first arch is the primary arch. But ndk/aml arch order have been [arm, arm64, x86, x86_64]. This fixes the order to workaround possible breakage while building ndk. Bug: 187196593 Test: OUT_DIR=out build/soong/scripts/build-ndk-prebuilts.sh Change-Id: I33164a7e7c64a23f2cc1860acb24a2584f4dffad --- android/arch.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/arch.go b/android/arch.go index 1fbba19c2..340f136c7 100644 --- a/android/arch.go +++ b/android/arch.go @@ -1572,20 +1572,20 @@ type archConfig struct { // with Neon will break those users. func getNdkAbisConfig() []archConfig { return []archConfig{ - {"arm", "armv7-a", "", []string{"armeabi-v7a"}}, {"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}}, - {"x86", "", "", []string{"x86"}}, + {"arm", "armv7-a", "", []string{"armeabi-v7a"}}, {"x86_64", "", "", []string{"x86_64"}}, + {"x86", "", "", []string{"x86"}}, } } // getAmlAbisConfig returns a list of archConfigs for the ABIs supported by mainline modules. func getAmlAbisConfig() []archConfig { return []archConfig{ - {"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}}, {"arm64", "armv8-a", "", []string{"arm64-v8a"}}, - {"x86", "", "", []string{"x86"}}, + {"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}}, {"x86_64", "", "", []string{"x86_64"}}, + {"x86", "", "", []string{"x86"}}, } }