diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/androidmk.go | 9 | ||||
| -rw-r--r-- | android/arch_list.go | 23 | ||||
| -rw-r--r-- | android/soong_config_modules_test.go | 3 |
3 files changed, 30 insertions, 5 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index f65e084be..235d7c0d6 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -276,14 +276,17 @@ func (a *AndroidMkEntries) AddStrings(name string, value ...string) { } // AddCompatibilityTestSuites adds the supplied test suites to the EntryMap, with special handling -// for partial MTS test suites. +// for partial MTS and MCTS test suites. func (a *AndroidMkEntries) AddCompatibilityTestSuites(suites ...string) { - // MTS supports a full test suite and partial per-module MTS test suites, with naming mts-${MODULE}. - // To reduce repetition, if we find a partial MTS test suite without an full MTS test suite, + // M(C)TS supports a full test suite and partial per-module MTS test suites, with naming mts-${MODULE}. + // To reduce repetition, if we find a partial M(C)TS test suite without an full M(C)TS test suite, // we add the full test suite to our list. if PrefixInList(suites, "mts-") && !InList("mts", suites) { suites = append(suites, "mts") } + if PrefixInList(suites, "mcts-") && !InList("mcts", suites) { + suites = append(suites, "mcts") + } a.AddStrings("LOCAL_COMPATIBILITY_SUITE", suites...) } diff --git a/android/arch_list.go b/android/arch_list.go index ab644a4aa..801ac49c8 100644 --- a/android/arch_list.go +++ b/android/arch_list.go @@ -34,6 +34,11 @@ var archVariants = map[ArchType][]string{ "broadwell", "goldmont", "goldmont-plus", + // Target arch is goldmont, but without xsaves support. + // This ensures efficient execution on a broad range of Intel/AMD CPUs used + // in Chromebooks, including those lacking xsaves support. + // (e.g. Kaby Lake, Gemini Lake, Alder Lake and AMD Zen series) + "goldmont-without-xsaves", "haswell", "icelake", "ivybridge", @@ -52,6 +57,7 @@ var archVariants = map[ArchType][]string{ "broadwell", "goldmont", "goldmont-plus", + "goldmont-without-xsaves", "haswell", "icelake", "ivybridge", @@ -197,6 +203,15 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{ "popcnt", "movbe", }, + "goldmont-without-xsaves": { + "ssse3", + "sse4", + "sse4_1", + "sse4_2", + "aes_ni", + "popcnt", + "movbe", + }, "haswell": { "ssse3", "sse4", @@ -358,6 +373,14 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{ "aes_ni", "popcnt", }, + "goldmont-without-xsaves": { + "ssse3", + "sse4", + "sse4_1", + "sse4_2", + "aes_ni", + "popcnt", + }, "haswell": { "ssse3", "sse4", diff --git a/android/soong_config_modules_test.go b/android/soong_config_modules_test.go index 79bdeb829..a6b2c51c6 100644 --- a/android/soong_config_modules_test.go +++ b/android/soong_config_modules_test.go @@ -376,8 +376,7 @@ func TestNonExistentPropertyInSoongConfigModule(t *testing.T) { prepareForSoongConfigTestModule, FixtureWithRootAndroidBp(bp), ).ExtendWithErrorHandler(FixtureExpectsAllErrorsToMatchAPattern([]string{ - // TODO(b/171232169): improve the error message for non-existent properties - `unrecognized property "soong_config_variables`, + `unrecognized property "soong_config_variables.feature1.made_up_property`, })).RunTest(t) } |