From 4416313943bea029dee87c56855ca8479b057e41 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@google.com>
Date: Mon, 13 Nov 2023 14:02:13 -0700
Subject: [PATCH 1/2] Update XML template to reflect null device.

Ravenwood doesn't need a device, so add a "null" filter so that
atest doesn't hang waiting for one.

Bug: 292141694
Test: atest-dev CtsOsTestCasesRavenwood CtsOsTestCases
Merged-in: I10ceeae92c7622ea44ecbc315e23babe8b36516a
Change-Id: I10ceeae92c7622ea44ecbc315e23babe8b36516a
---
 core/ravenwood_test_config_template.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/ravenwood_test_config_template.xml b/core/ravenwood_test_config_template.xml
index b9002687b1..0cae135e6a 100644
--- a/core/ravenwood_test_config_template.xml
+++ b/core/ravenwood_test_config_template.xml
@@ -22,6 +22,7 @@
     <option name="use-ravenwood-resources" value="true" />
     <option name="exclude-paths" value="java" />
     <option name="socket-timeout" value="10000" />
+    <option name="null-device" value="true" />
 
     {EXTRA_CONFIGS}
 

From 91412af6e2c6f56ff29c5ccf002bf547bdcbe8ac Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@google.com>
Date: Thu, 8 Feb 2024 09:41:36 -0700
Subject: [PATCH 2/2] Basic `ParcelFileDescriptor` on Ravenwood.

One of the final foundational building blocks, which wraps a Java
`FileDescriptor` object.  Since many of the existing APIs here offer
to work with "raw" int FD values, we need to reach "behind the
curtain" to read/write the internal value.  Thankfully `SharedSecrets`
already offers a way to gain access without requiring us to open
up the entire `java.io` area of the `java.base` module.

Bring along `android.util.CloseGuard` as a no-op wrapper.

Bug: 324417456
Test: atest CtsOsTestCasesRavenwood
Merged-in: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
Change-Id: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
---
 core/OWNERS                             | 3 +++
 core/ravenwood_test_config_template.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/core/OWNERS b/core/OWNERS
index c98196a7c1..36951a9589 100644
--- a/core/OWNERS
+++ b/core/OWNERS
@@ -7,3 +7,6 @@ per-file version_defaults.mk = ankurbakshi@google.com,bkhalife@google.com,jainne
 
 # For sdk extensions version updates
 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
diff --git a/core/ravenwood_test_config_template.xml b/core/ravenwood_test_config_template.xml
index 0cae135e6a..16a22c0628 100644
--- a/core/ravenwood_test_config_template.xml
+++ b/core/ravenwood_test_config_template.xml
@@ -37,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.tree=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>
 </configuration>