diff options
| author | 2025-01-10 18:03:53 -0800 | |
|---|---|---|
| committer | 2025-01-10 18:03:53 -0800 | |
| commit | b9d00005d61ecefe03652b665fabff84ec9dab72 (patch) | |
| tree | 0e70b88e58e1a289431ef80f5dd31250447db654 /java/java.go | |
| parent | c3931d243d05f2f7403b2a748b7a69254f017428 (diff) | |
| parent | c7315286bb3abf2a7706400211dccd5e1eaa90ad (diff) | |
Merge "_test module types shouldn't override user-set test property" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 25be93b46..48ba8def2 100644 --- a/java/java.go +++ b/java/java.go @@ -1781,7 +1781,7 @@ func TestFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) module.Module.dexpreopter.isTest = true - module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true) + module.Module.linter.properties.Lint.Test_module_type = proptools.BoolPtr(true) module.Module.sourceProperties.Test_only = proptools.BoolPtr(true) module.Module.sourceProperties.Top_level_test_target = true @@ -1798,7 +1798,7 @@ func TestHelperLibraryFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) module.Module.dexpreopter.isTest = true - module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true) + module.Module.linter.properties.Lint.Test_module_type = proptools.BoolPtr(true) module.Module.sourceProperties.Test_only = proptools.BoolPtr(true) InitJavaModule(module, android.HostAndDeviceSupported) |