Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ddb08c8 authored by Inseob Kim's avatar Inseob Kim
Browse files

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
Merged-In: I33164a7e7c64a23f2cc1860acb24a2584f4dffad
parent edca3f43

android/arch.go

+4 −4
Original line number Diff line number Diff line
@@ -1543,20 +1543,20 @@ type archConfig struct { 
// getNdkAbisConfig returns a list of archConfigs for the ABIs supported by the NDK.

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"}},

	}

}