From b9ec7b43ca884f6f9a05e19cb7722934c016905d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 6 Nov 2015 13:04:15 -0800
Subject: Delete androidbp

androidbp is gone, replaced with combining kati ninja output for
makefiles with blueprint ninja output for soong.

Change-Id: I00b9e28877abf2ceb2223d3ccf0637bc1b7571bb
---
 common/defs.go   | 10 ----------
 common/module.go | 43 -------------------------------------------
 2 files changed, 53 deletions(-)

(limited to 'common')

diff --git a/common/defs.go b/common/defs.go
index 67fcb1f3..7b2a7067 100644
--- a/common/defs.go
+++ b/common/defs.go
@@ -15,8 +15,6 @@
 package common
 
 import (
-	"path/filepath"
-
 	"github.com/google/blueprint"
 	_ "github.com/google/blueprint/bootstrap"
 )
@@ -29,14 +27,6 @@ var (
 
 	srcDir = pctx.VariableConfigMethod("srcDir", Config.SrcDir)
 
-	androidbpCmd = filepath.Join("${bootstrap.BinDir}", "androidbp")
-	androidbp    = pctx.StaticRule("androidbp",
-		blueprint.RuleParams{
-			Command:     androidbpCmd + " ${srcDir}/Android.bp $in $out",
-			CommandDeps: []string{androidbpCmd},
-			Description: "androidbp $out",
-		})
-
 	// A phony rule that is not the built-in Ninja phony rule.  The built-in
 	// phony rule has special behavior that is sometimes not desired.  See the
 	// Ninja docs for more details.
diff --git a/common/module.go b/common/module.go
index 33a801fe..b64342f6 100644
--- a/common/module.go
+++ b/common/module.go
@@ -18,8 +18,6 @@ import (
 	"android/soong"
 	"path/filepath"
 	"runtime"
-	"sort"
-	"strings"
 
 	"android/soong/glob"
 
@@ -544,45 +542,4 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx blueprint.SingletonConte
 			Optional:  true,
 		})
 	}
-
-	// Create Android.bp->mk translation rules
-	androidMks := []string{}
-	srcDir := ctx.Config().(Config).SrcDir()
-	intermediatesDir := filepath.Join(ctx.Config().(Config).IntermediatesDir(), "androidmk")
-	sort.Strings(bpFiles)
-	for _, origBp := range bpFiles {
-		bpFile := filepath.Join(srcDir, origBp)
-		mkFile := filepath.Join(srcDir, filepath.Dir(origBp), "Android.mk")
-
-		files, err := Glob(ctx, intermediatesDir, mkFile, nil)
-		if err != nil {
-			ctx.Errorf("glob: %s", err.Error())
-			continue
-		}
-
-		// Existing Android.mk file, use that instead
-		if len(files) > 0 {
-			for _, file := range files {
-				ctx.AddNinjaFileDeps(file)
-			}
-			continue
-		}
-
-		transMk := filepath.Join("androidmk", "Android_"+strings.Replace(filepath.Dir(origBp), "/", "_", -1)+".mk")
-		ctx.Build(pctx, blueprint.BuildParams{
-			Rule:     androidbp,
-			Outputs:  []string{transMk},
-			Inputs:   []string{bpFile},
-			Optional: true,
-		})
-
-		androidMks = append(androidMks, transMk)
-	}
-
-	ctx.Build(pctx, blueprint.BuildParams{
-		Rule:      blueprint.Phony,
-		Outputs:   []string{"androidmk"},
-		Implicits: androidMks,
-		Optional:  true,
-	})
 }
-- 
cgit v1.2.3