From e34744890c6c44853a0169f8078ed13abc9ca902 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 14 Oct 2022 15:55:31 -0700
Subject: [PATCH] Add java flags from external/robolectric-shadows/robotest.sh
 to tradefed template

Add the same flags as external/robolectric-shadows/robotest.sh to
robolectric_test_config_template.xml so they apply to tests run
with atest or the test infra too.

Test: atest --host MyRoboTests
Change-Id: Iaac2dc30b82e6fcdc028e9dcdfaf0b1c7e9a2ba3
---
 core/robolectric_test_config_template.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/robolectric_test_config_template.xml b/core/robolectric_test_config_template.xml
index 8c0358226c..56d2312626 100644
--- a/core/robolectric_test_config_template.xml
+++ b/core/robolectric_test_config_template.xml
@@ -26,5 +26,12 @@
 
     <test class="com.android.tradefed.testtype.IsolatedHostTest" >
         <option name="jar" value="{MODULE}.jar" />
+        <option name="java-flags" value="--add-modules=jdk.compiler"/>
+        <option name="java-flags" value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
+        <option name="java-flags" value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED"/>
+        <!-- b/238100560 -->
+        <option name="java-flags" value="--add-opens=java.base/jdk.internal.util.random=ALL-UNNAMED"/>
+        <!-- b/251387255 -->
+        <option name="java-flags" value="--add-opens=java.base/java.io=ALL-UNNAMED"/>
     </test>
 </configuration>