diff options
author | Jeff Gaston <jeffrygaston@google.com> | 2017-05-26 00:32:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-26 00:32:38 +0000 |
commit | ee765dc4ab469c7816d8a0560fa501dc69faa471 (patch) | |
tree | b501c83a7ba64881e1e5cbec4877b3c11e60e976 | |
parent | 4e87d89066135d549ab3947cabc4479880997e5e (diff) | |
parent | eb3186abbe1c353c77d38be1f16720940f6925d5 (diff) | |
download | build_soong-ee765dc4ab469c7816d8a0560fa501dc69faa471.tar.gz build_soong-ee765dc4ab469c7816d8a0560fa501dc69faa471.tar.bz2 build_soong-ee765dc4ab469c7816d8a0560fa501dc69faa471.zip |
Merge "Revert "Run bpfix at the end of androidmk""
-rw-r--r-- | androidmk/Android.bp | 1 | ||||
-rw-r--r-- | androidmk/cmd/androidmk/androidmk.go | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/androidmk/Android.bp b/androidmk/Android.bp index 442452f8..67baf0ae 100644 --- a/androidmk/Android.bp +++ b/androidmk/Android.bp @@ -29,7 +29,6 @@ blueprint_go_binary { deps: [ "androidmk-parser", "blueprint-parser", - "bpfix-lib", ], } diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index d26643ae..1d94b65e 100644 --- a/androidmk/cmd/androidmk/androidmk.go +++ b/androidmk/cmd/androidmk/androidmk.go @@ -8,8 +8,6 @@ import ( "strings" "text/scanner" - "android/soong/bpfix/bpfix" - mkparser "android/soong/androidmk/parser" bpparser "github.com/google/blueprint/parser" @@ -178,18 +176,10 @@ func convertFile(filename string, buffer *bytes.Buffer) (string, []error) { } } - tree := &bpparser.File{ + out, err := bpparser.Print(&bpparser.File{ Defs: file.defs, Comments: file.comments, - } - - // check for common supported but undesirable structures and clean them up - fixed, err := bpfix.FixTree(tree, bpfix.NewFixRequest().AddAll()) - if err != nil { - return "", []error{err} - } - - out, err := bpparser.Print(fixed) + }) if err != nil { return "", []error{err} } |