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

Merge "Remove test_min_api_level property"

Browse Source
This commit is contained in:
Treehugger Robot
2021-12-09 05:51:25 +00:00
committed by Gerrit Code Review
parent 9f5a9d1d54 d396515482
commit ea8b7771f1
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/test.go
View File

@@ -105,11 +105,6 @@ type TestBinaryProperties struct {
// Add RunCommandTargetPreparer to stop framework before the test and start it after the test. // Add RunCommandTargetPreparer to stop framework before the test and start it after the test.
Disable_framework *bool Disable_framework *bool
// Add ShippingApiLevelModuleController to auto generated test config. If the device properties
// for the shipping api level is less than the test_min_api_level, skip this module.
// Deprecated (b/187258404). Use test_options.min_shipping_api_level instead.
Test_min_api_level *int64
// Flag to indicate whether or not to create test config automatically. If AndroidTest.xml // Flag to indicate whether or not to create test config automatically. If AndroidTest.xml
// doesn't exist next to the Android.bp, this attribute doesn't need to be set to true // doesn't exist next to the Android.bp, this attribute doesn't need to be set to true
// explicitly. // explicitly.
@@ -432,14 +427,6 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) {
var options []tradefed.Option var options []tradefed.Option
options = append(options, tradefed.Option{Name: "min-api-level", Value: strconv.FormatInt(int64(*test.Properties.Test_options.Min_shipping_api_level), 10)}) options = append(options, tradefed.Option{Name: "min-api-level", Value: strconv.FormatInt(int64(*test.Properties.Test_options.Min_shipping_api_level), 10)})
configs = append(configs, tradefed.Object{"module_controller", "com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController", options}) configs = append(configs, tradefed.Object{"module_controller", "com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController", options})
} else if test.Properties.Test_min_api_level != nil {
// TODO: (b/187258404) Remove test.Properties.Test_min_api_level
if test.Properties.Test_options.Vsr_min_shipping_api_level != nil {
ctx.PropertyErrorf("test_min_api_level", "must not be set at the same time as 'vsr_min_shipping_api_level'.")
}
var options []tradefed.Option
options = append(options, tradefed.Option{Name: "min-api-level", Value: strconv.FormatInt(int64(*test.Properties.Test_min_api_level), 10)})
configs = append(configs, tradefed.Object{"module_controller", "com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController", options})
} }
if test.Properties.Test_options.Vsr_min_shipping_api_level != nil { if test.Properties.Test_options.Vsr_min_shipping_api_level != nil {
var options []tradefed.Option var options []tradefed.Option