StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "init_first_stage_soong" am: 957ef7a648 am: 639a38f615

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738296

Change-Id: I1f97e292e9978d5cc1b63c3aee765029c0e67151
This commit is contained in:
Inseob Kim
2021-06-18 18:15:08 +00:00
committed by Automerger Merge Worker
parent c27bb611a8 639a38f615
commit cf9fffcf35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/arch.go
View File

@@ -1572,20 +1572,20 @@ type archConfig struct {
// with Neon will break those users. // with Neon will break those users.
func getNdkAbisConfig() []archConfig { func getNdkAbisConfig() []archConfig {
return []archConfig{ return []archConfig{
{"arm", "armv7-a", "", []string{"armeabi-v7a"}},
{"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}}, {"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}},
{"x86", "", "", []string{"x86"}}, {"arm", "armv7-a", "", []string{"armeabi-v7a"}},
{"x86_64", "", "", []string{"x86_64"}}, {"x86_64", "", "", []string{"x86_64"}},
{"x86", "", "", []string{"x86"}},
} }
} }
// getAmlAbisConfig returns a list of archConfigs for the ABIs supported by mainline modules. // getAmlAbisConfig returns a list of archConfigs for the ABIs supported by mainline modules.
func getAmlAbisConfig() []archConfig { func getAmlAbisConfig() []archConfig {
return []archConfig{ return []archConfig{
{"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}},
{"arm64", "armv8-a", "", []string{"arm64-v8a"}}, {"arm64", "armv8-a", "", []string{"arm64-v8a"}},
{"x86", "", "", []string{"x86"}}, {"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}},
{"x86_64", "", "", []string{"x86_64"}}, {"x86_64", "", "", []string{"x86_64"}},
{"x86", "", "", []string{"x86"}},
} }
} }