From 3fbf2bea6ada498fcac0de7e190044fa3063902a Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 25 Mar 2021 17:56:29 -0700
Subject: [PATCH] Default metalava sandboxing to true

Turn on sandboxing everywhere.

Bug: 153703940
Test: m checkbuild
Change-Id: Ie64913d302efb780d5be9c1b32e6c368d72feba3
---
 java/droidstubs.go      | 2 +-
 java/droidstubs_test.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/droidstubs.go b/java/droidstubs.go
index be4d8f848..d7a066832 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -482,7 +482,7 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 
 	rule := android.NewRuleBuilder(pctx, ctx)
 
-	sandbox := proptools.Bool(d.Javadoc.properties.Sandbox)
+	sandbox := proptools.BoolDefault(d.Javadoc.properties.Sandbox, true)
 	if sandbox {
 		rule.Sbox(android.PathForModuleOut(ctx, "metalava"),
 			android.PathForModuleOut(ctx, "metalava.sbox.textproto")).
diff --git a/java/droidstubs_test.go b/java/droidstubs_test.go
index 6ad932329..f8125fb8c 100644
--- a/java/droidstubs_test.go
+++ b/java/droidstubs_test.go
@@ -34,6 +34,7 @@ func TestDroidstubs(t *testing.T) {
 			srcs: ["bar-doc/a.java"],
 			api_levels_annotations_dirs: ["droiddoc-templates-sdk"],
 			api_levels_annotations_enabled: true,
+			sandbox: false,
 		}
 
 		droidstubs {
@@ -43,6 +44,7 @@ func TestDroidstubs(t *testing.T) {
 			api_levels_annotations_dirs: ["droiddoc-templates-sdk"],
 			api_levels_annotations_enabled: true,
 			api_levels_jar_filename: "android.other.jar",
+			sandbox: false,
 		}
 		`,
 		map[string][]byte{