Loading cc/testing.go +2 −1 Original line number Diff line number Diff line Loading @@ -739,12 +739,13 @@ func AssertExcludeFromRecoverySnapshotIs(t *testing.T, ctx *android.TestContext, } func checkOverrides(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, jsonPath string, expected []string) { t.Helper() out := singleton.MaybeOutput(jsonPath) content := android.ContentFromFileRuleForTests(t, out) var flags snapshotJsonFlags if err := json.Unmarshal([]byte(content), &flags); err != nil { t.Errorf("Error while unmarshalling json %q: %w", jsonPath, err) t.Errorf("Error while unmarshalling json %q: %s", jsonPath, err.Error()) return } Loading Loading
cc/testing.go +2 −1 Original line number Diff line number Diff line Loading @@ -739,12 +739,13 @@ func AssertExcludeFromRecoverySnapshotIs(t *testing.T, ctx *android.TestContext, } func checkOverrides(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, jsonPath string, expected []string) { t.Helper() out := singleton.MaybeOutput(jsonPath) content := android.ContentFromFileRuleForTests(t, out) var flags snapshotJsonFlags if err := json.Unmarshal([]byte(content), &flags); err != nil { t.Errorf("Error while unmarshalling json %q: %w", jsonPath, err) t.Errorf("Error while unmarshalling json %q: %s", jsonPath, err.Error()) return } Loading