StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Default metalava sandboxing to true" am: 8b6378b0dc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654170

Change-Id: Id89be56d43c5f5aad1e32e218c81a53b62ec22d5
This commit is contained in:
Colin Cross
2021-03-31 00:15:16 +00:00
committed by Automerger Merge Worker
parent c9ec211cca 8b6378b0dc
commit 0d6a3af0f7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/droidstubs.go
View File

@@ -482,7 +482,7 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
sandbox := proptools.Bool(d.Javadoc.properties.Sandbox) sandbox := proptools.BoolDefault(d.Javadoc.properties.Sandbox, true)
if sandbox { if sandbox {
rule.Sbox(android.PathForModuleOut(ctx, "metalava"), rule.Sbox(android.PathForModuleOut(ctx, "metalava"),
android.PathForModuleOut(ctx, "metalava.sbox.textproto")). android.PathForModuleOut(ctx, "metalava.sbox.textproto")).

2
java/droidstubs_test.go
View File

@@ -34,6 +34,7 @@ func TestDroidstubs(t *testing.T) {
srcs: ["bar-doc/a.java"], srcs: ["bar-doc/a.java"],
api_levels_annotations_dirs: ["droiddoc-templates-sdk"], api_levels_annotations_dirs: ["droiddoc-templates-sdk"],
api_levels_annotations_enabled: true, api_levels_annotations_enabled: true,
sandbox: false,
} }
droidstubs { droidstubs {
@@ -43,6 +44,7 @@ func TestDroidstubs(t *testing.T) {
api_levels_annotations_dirs: ["droiddoc-templates-sdk"], api_levels_annotations_dirs: ["droiddoc-templates-sdk"],
api_levels_annotations_enabled: true, api_levels_annotations_enabled: true,
api_levels_jar_filename: "android.other.jar", api_levels_jar_filename: "android.other.jar",
sandbox: false,
} }
`, `,
map[string][]byte{ map[string][]byte{