commit 46ac3866f177ecf3a2d0d7318573ffdf34da7f96
author Alan Stokes <alanstokes@google.com> Tue Dec 21 15:31:47 2021 +0000
committer Alan Stokes <alanstokes@google.com> Tue Jan 04 09:54:56 2022 +0000
tree 45a2675a2995c29bb9328d8a2429eddcde963542
parent 67d248e24ac780995a945b167effef077e626241

Add support for STANDALONE_SYSTEMSERVER_JARS

Stop differentiating between the different ways an APEX can contribute
to derive_classpath - it makes no difference to us, and it doesn't
scale if new environment variables are added.

Remove the workaround to stop the tests failing. Extended the existing
temporary workaround for setting the environment variables in the VM.

Bug: 210472252
Test: atest ApexTestCases
Test: atest ComposTestCase
Test: composd_cmd staged-apex-compile
Change-Id: I97b48cf71c6f22ade27c1ca2e0bad1bb9ab582fc

compos/composd/src/instance_starter.rs

diff --git a/compos/composd/src/instance_starter.rs b/compos/composd/src/instance_starter.rs
index 91a0e61..729e5b6 100644
--- a/compos/composd/src/instance_starter.rs
+++ b/compos/composd/src/instance_starter.rs
@@ -161,6 +161,7 @@
                 &env::var("BOOTCLASSPATH")?,
                 &env::var("DEX2OATBOOTCLASSPATH")?,
                 &env::var("SYSTEMSERVERCLASSPATH")?,
+                &env::var("STANDALONE_SYSTEMSERVER_JARS")?,
             )
             .context("Initializing *CLASSPATH")?;
         Ok(())