Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." am: 1d9e2364ed am: 30a6edb924

Change-Id: I2134c97ff74f278033887a0e9ea5f758f4080772

java/java.go

@@ -2044,6 +2044,10 @@ type testProperties struct {
 	// doesn't exist next to the Android.bp, this attribute doesn't need to be set to true
 	// explicitly.
 	Auto_gen_config *bool
+
+	// Add parameterized mainline modules to auto generated test config. The options will be
+	// handled by TradeFed to do downloading and installing the specified modules on the device.
+	Test_mainline_modules []string
 }
 
 type testHelperLibraryProperties struct {