From c7315286bb3abf2a7706400211dccd5e1eaa90ad Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 10 Jan 2025 15:37:01 -0800 Subject: _test module types shouldn't override user-set test property Android lint considers code "test" code depending on if the --test flag is passed. We pass it by default for *_test module types, but also allow the user to control it via the "lint: { test: true }" property. However, the module types were overriding the user-defined test property if the user-defined one was supplied via a defaults module. Split the test property into two so that modules can use a separate lower priority one from the user-controlled one. Fixes: 358643466 Test: m nothing --no-skip-soong-tests Change-Id: I1b1ef7a73ca9f413aa29e0c6025134fc52dc7caf --- java/java.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 0ab344066..4cd183765 100644 --- a/java/java.go +++ b/java/java.go @@ -1740,7 +1740,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 @@ -1757,7 +1757,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) -- cgit v1.2.3-59-g8ed1b