diff options
| author | Colin Cross <ccross@android.com> | 2018-04-11 16:10:18 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-05-03 14:38:33 -0700 |
| commit | be32d9b0405a83159f8d11c2b985e9fe1a97d80b (patch) | |
| tree | 5245821389620701507e9dbfcbc05b1c1cdc3a43 /androidmk | |
| parent | a4ffa9addbd995be5acd9cbfddeb0821790a014b (diff) | |
| download | build_soong-be32d9b0405a83159f8d11c2b985e9fe1a97d80b.tar.gz build_soong-be32d9b0405a83159f8d11c2b985e9fe1a97d80b.tar.bz2 build_soong-be32d9b0405a83159f8d11c2b985e9fe1a97d80b.zip | |
Make bpfix not modify the input tree
Make a new object called Fixer to hold the state of the tree, and
make a copy of the input tree so the original doesn't get modified.
Bug: 73724997
Test: bpfix_test.go
Change-Id: I1dc6fd99158c8b0e1db029df99e6cf72699a5e63
Merged-In: I1dc6fd99158c8b0e1db029df99e6cf72699a5e63
(cherry picked from commit adee968a4bace28bd26253bc436043eb513f6117)
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index 6e0b474b..b6a973c0 100644 --- a/androidmk/cmd/androidmk/androidmk.go +++ b/androidmk/cmd/androidmk/androidmk.go @@ -239,7 +239,8 @@ func convertFile(filename string, buffer *bytes.Buffer) (string, []error) { } // check for common supported but undesirable structures and clean them up - err := bpfix.FixTree(tree, bpfix.NewFixRequest().AddAll()) + fixer := bpfix.NewFixer(tree) + tree, err := fixer.Fix(bpfix.NewFixRequest().AddAll()) if err != nil { return "", []error{err} } |