summaryrefslogtreecommitdiff
path: root/java/robolectric.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-01-10 18:03:53 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-01-10 18:03:53 -0800
commitb9d00005d61ecefe03652b665fabff84ec9dab72 (patch)
tree0e70b88e58e1a289431ef80f5dd31250447db654 /java/robolectric.go
parentc3931d243d05f2f7403b2a748b7a69254f017428 (diff)
parentc7315286bb3abf2a7706400211dccd5e1eaa90ad (diff)
Merge "_test module types shouldn't override user-set test property" into main
Diffstat (limited to 'java/robolectric.go')
-rw-r--r--java/robolectric.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/robolectric.go b/java/robolectric.go
index 0c11b1c72..29aa2f02d 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -20,6 +20,7 @@ import (
"android/soong/android"
"android/soong/java/config"
"android/soong/tradefed"
+
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
@@ -295,7 +296,7 @@ func RobolectricTestFactory() android.Module {
&module.testProperties)
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.testProperties.Test_suites = []string{"robolectric-tests"}