diff options
| author | Colin Cross <ccross@android.com> | 2018-04-11 16:10:18 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-04-16 17:32:08 +0000 |
| commit | adee968a4bace28bd26253bc436043eb513f6117 (patch) | |
| tree | d7cae099a531473714d03d1e4586b7b22a67302c /androidmk | |
| parent | 02b4da53a76b4ba18e3e14588826d7af45ccd6b5 (diff) | |
| download | build_soong-adee968a4bace28bd26253bc436043eb513f6117.tar.gz build_soong-adee968a4bace28bd26253bc436043eb513f6117.tar.bz2 build_soong-adee968a4bace28bd26253bc436043eb513f6117.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.
Test: bpfix_test.go
Change-Id: I1dc6fd99158c8b0e1db029df99e6cf72699a5e63
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} } |