Merge "Initial Fuchsia support."
diff --git a/java/java.go b/java/java.go
index c89cb1a..2ac5a5b 100644
--- a/java/java.go
+++ b/java/java.go
@@ -998,12 +998,11 @@
if ctx.Device() && !ctx.Config().IsEnvFalse("TURBINE_ENABLED") {
if j.properties.Javac_shard_size != nil && *(j.properties.Javac_shard_size) > 0 {
enable_sharding = true
- if len(j.properties.Annotation_processors) != 0 ||
- len(j.properties.Annotation_processor_classes) != 0 {
- ctx.PropertyErrorf("javac_shard_size",
- "%q cannot be set when annotation processors are enabled.",
- j.properties.Javac_shard_size)
- }
+ // Formerly, there was a check here that prevented annotation processors
+ // from being used when sharding was enabled, as some annotation processors
+ // do not function correctly in sharded environments. It was removed to
+ // allow for the use of annotation processors that do function correctly
+ // with sharding enabled. See: b/77284273.
}
j.headerJarFile = j.compileJavaHeader(ctx, uniqueSrcFiles, srcJars, deps, flags, jarName, kotlinJars)
if ctx.Failed() {
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index e8e92e6..1d8684b 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -97,7 +97,6 @@
"lsof": Allowed,
"m4": Allowed,
"md5sum": Allowed,
- "mv": Allowed,
"openssl": Allowed,
"patch": Allowed,
"pgrep": Allowed,
@@ -157,6 +156,7 @@
"ls": Toybox,
"mkdir": Toybox,
"mktemp": Toybox,
+ "mv": Toybox,
"od": Toybox,
"paste": Toybox,
"pwd": Toybox,
diff --git a/ui/build/sandbox_linux.go b/ui/build/sandbox_linux.go
index f77eebb..85c4a9a 100644
--- a/ui/build/sandbox_linux.go
+++ b/ui/build/sandbox_linux.go
@@ -127,6 +127,9 @@
// in soong_ui
"-e",
+ // Mount /proc read-write, necessary to run a nested nsjail or minijail0
+ "--proc_rw",
+
// Use a consistent user & group.
// Note that these are mapped back to the real UID/GID when
// doing filesystem operations, so they're rather arbitrary.