From eb3186abbe1c353c77d38be1f16720940f6925d5 Mon Sep 17 00:00:00 2001
From: Jeff Gaston <jeffrygaston@google.com>
Date: Fri, 26 May 2017 00:30:01 +0000
Subject: [PATCH] Revert "Run bpfix at the end of androidmk"

This reverts commit 7fd905ae26ac2cb9333a81feb928df339c5b4bc4.

Reason for revert: postsubmit build broken

Change-Id: Iddff17616c7307918380e15c1ed69ee5625a6c8e
---
 androidmk/Android.bp                 |  1 -
 androidmk/cmd/androidmk/androidmk.go | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/androidmk/Android.bp b/androidmk/Android.bp
index 442452f83..67baf0aeb 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 d26643ae0..1d94b65e8 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}
 	}