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

Commit 0ed6bf53 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge changes from topic "init_first_stage_soong" into sc-dev am: a66e2b2c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15067022

Change-Id: Ia37a75bcb70012c86c6c1bfaba53c4524693f317
parents e5a1dcaa a66e2b2c

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

	}

}