Merge "Move common test_options properties into the android package"

2022-08-17 15:22:18 +00:00
parent b2f584ba58 0ac5a431a9
commit 852d0c4859
11 changed files with 93 additions and 59 deletions
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -167,9 +167,8 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries {
 			entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true")
 		}
 		entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", j.testProperties.Test_mainline_modules...)
-		if Bool(j.testProperties.Test_options.Unit_test) {
-			entries.SetBool("LOCAL_IS_UNIT_TEST", true)
-		}
+
+		j.testProperties.Test_options.CommonTestOptions.SetAndroidMkEntries(entries)
 	})

 	return entriesList