Remove "Test" prop from xx_aconfig_library build rules
Test: CI
Bug: 309990433
Change-Id: Id78f65d4083571f310686589a18cabe13bbd5d62
diff --git a/aconfig/cc_aconfig_library.go b/aconfig/cc_aconfig_library.go
index 8aa696b..210a581 100644
--- a/aconfig/cc_aconfig_library.go
+++ b/aconfig/cc_aconfig_library.go
@@ -38,10 +38,6 @@
// name of the aconfig_declarations module to generate a library for
Aconfig_declarations string
- // whether to generate test mode version of the library
- // TODO: remove "Test" property when "Mode" can be used in all the branches
- Test *bool
-
// default mode is "production", the other accepted modes are:
// "test": to generate test mode version of the library
// "exported": to generate exported mode version of the library
@@ -128,17 +124,11 @@
}
declarations := ctx.OtherModuleProvider(declarationsModules[0], declarationsProviderKey).(declarationsProviderData)
- if this.properties.Mode != nil && this.properties.Test != nil {
- ctx.PropertyErrorf("test", "test prop should not be specified when mode prop is set")
- }
mode := proptools.StringDefault(this.properties.Mode, "production")
if !isModeSupported(mode) {
ctx.PropertyErrorf("mode", "%q is not a supported mode", mode)
}
- // TODO: remove "Test" property
- if proptools.Bool(this.properties.Test) {
- mode = "test"
- }
+
ctx.Build(pctx, android.BuildParams{
Rule: cppRule,
Input: declarations.IntermediatePath,