Merge changes I8af63d1c,I10ceeae9 into main
* changes: Basic `ParcelFileDescriptor` on Ravenwood. Update XML template to reflect null device.
This commit is contained in:
@@ -7,3 +7,6 @@ per-file version_defaults.mk = ankurbakshi@google.com,bkhalife@google.com,jainne
|
|||||||
|
|
||||||
# For sdk extensions version updates
|
# For sdk extensions version updates
|
||||||
per-file version_defaults.mk = amhk@google.com,gurpreetgs@google.com,mkhokhlova@google.com,robertogil@google.com
|
per-file version_defaults.mk = amhk@google.com,gurpreetgs@google.com,mkhokhlova@google.com,robertogil@google.com
|
||||||
|
|
||||||
|
# For Ravenwood test configs
|
||||||
|
per-file ravenwood_test_config_template.xml = jsharkey@google.com,omakoto@google.com
|
||||||
|
@@ -22,6 +22,7 @@
|
|||||||
<option name="use-ravenwood-resources" value="true" />
|
<option name="use-ravenwood-resources" value="true" />
|
||||||
<option name="exclude-paths" value="java" />
|
<option name="exclude-paths" value="java" />
|
||||||
<option name="socket-timeout" value="10000" />
|
<option name="socket-timeout" value="10000" />
|
||||||
|
<option name="null-device" value="true" />
|
||||||
|
|
||||||
{EXTRA_CONFIGS}
|
{EXTRA_CONFIGS}
|
||||||
|
|
||||||
@@ -36,5 +37,8 @@
|
|||||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
|
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
|
||||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
|
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
|
||||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
|
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
|
||||||
|
|
||||||
|
<!-- Needed for supporting ParcelFileDescriptor internals -->
|
||||||
|
<option name="java-flags" value="--add-exports=java.base/jdk.internal.access=ALL-UNNAMED"/>
|
||||||
</test>
|
</test>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Reference in New Issue
Block a user