diff options
| author | Jiakai Zhang <jiakaiz@google.com> | 2021-11-19 20:33:33 +0000 |
|---|---|---|
| committer | Jiakai Zhang <jiakaiz@google.com> | 2021-11-19 20:47:12 +0000 |
| commit | 5c3e714b327d8745285090fb5ee7491439bb9e36 (patch) | |
| tree | 7a6f60028cc2ab0c81599ecd8b90784ac63b2914 | |
| parent | 60bece0c18093107f4ad02a3828ed94f3b5895cd (diff) | |
| download | xsdc-5c3e714b327d8745285090fb5ee7491439bb9e36.tar.gz | |
Add the `.xsd` file to the output files of the `xsd_config` module.
This change fixes the broken test (b/207046888) due to aosp/1877223.
Bug: 207046888
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I4f262a93bc430a05cf4564a81616c350c71ffb5e
| -rw-r--r-- | build/xsdc.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build/xsdc.go b/build/xsdc.go index 698008c..f92ba28 100644 --- a/build/xsdc.go +++ b/build/xsdc.go @@ -101,7 +101,7 @@ type xsdConfig struct { docsPath android.Path xsdConfigPath android.OptionalPath - genOutputs android.Paths + genOutputs android.WritablePaths } var _ android.SourceFileProducer = (*xsdConfig)(nil) @@ -132,7 +132,10 @@ func (module *xsdConfig) GeneratedSourceFiles() android.Paths { } func (module *xsdConfig) Srcs() android.Paths { - return append(module.genOutputs, module.genOutputs_j) + var srcs android.WritablePaths + srcs = append(srcs, module.genOutputs...) + srcs = append(srcs, module.genOutputs_j) + return srcs.Paths() } func (module *xsdConfig) GeneratedDeps() android.Paths { @@ -314,6 +317,7 @@ func (module *xsdConfig) OutputFiles(tag string) (android.Paths, error) { outputs = append(outputs, module.genOutputs_j) outputs = append(outputs, module.genOutputs_c...) outputs = append(outputs, module.genOutputs_h...) + outputs = append(outputs, module.genOutputs...) return outputs.Paths(), nil case "java": return android.Paths{module.genOutputs_j}, nil |