Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bec7f53e authored by David Su's avatar David Su Committed by Colin Cross
Browse files

Revert "Add prebuilt_build_tool to allow genrules to use prebuil..." 

Revert submission 1366377-prebuilt_build_tool_make

Reason for revert: breaks build
Reverted Changes:
I20bf062bb:Export prebuilt tools to Make
I4bb526492:Move some prebuilt build tool configs to Soong
I195b68813:Support per-module MakeVars
Ibcb257e7b:Fix dependency loop with flex
I6150f0f39:Switch cc's use of bison and flex to prebuilt_buil...
I6939451b8:Reland "Use genrules to build a consistent awk."
Idee60640f:Add prebuilt_build_tool modules for genrule use
I00893172b:Rename bison to bison_bin
I82c26be1c:Add prebuilt_build_tool to allow genrules to use p...

Change-Id: I6b3acf306d355f3e0463564c9ebe9482fa0f609e
parent dd18efd9

android/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ bootstrap_go_package { 
        "paths.go",

        "phony.go",

        "prebuilt.go",

        "prebuilt_build_tool.go",

        "proto.go",

        "register.go",

        "rule_builder.go",

android/defs.go

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ var ( 
	// A symlink rule.

	Symlink = pctx.AndroidStaticRule("Symlink",

		blueprint.RuleParams{

			Command:     "rm -f $out && ln -f -s $fromPath $out",

			Command:     "ln -f -s $fromPath $out",

			Description: "symlink $out",

		},

		"fromPath")

android/prebuilt_build_tool.go

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
// Copyright 2020 Google Inc. All rights reserved.

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package android



import (

	"path"

	"path/filepath"

)



func init() {

	RegisterModuleType("prebuilt_build_tool", prebuiltBuildToolFactory)

}



type prebuiltBuildToolProperties struct {

	// Source file to be executed for this build tool

	Src *string `android:"path,arch_variant"`



	// Extra files that should trigger rules using this tool to rebuild

	Deps []string `android:"path,arch_variant"`

}



type prebuiltBuildTool struct {

	ModuleBase

	prebuilt Prebuilt



	properties prebuiltBuildToolProperties



	toolPath OptionalPath

}



func (t *prebuiltBuildTool) Name() string {

	return t.prebuilt.Name(t.ModuleBase.Name())

}



func (t *prebuiltBuildTool) Prebuilt() *Prebuilt {

	return &t.prebuilt

}



func (t *prebuiltBuildTool) DepsMutator(ctx BottomUpMutatorContext) {

	if t.properties.Src == nil {

		ctx.PropertyErrorf("src", "missing prebuilt source file")

	}

}



func (t *prebuiltBuildTool) GenerateAndroidBuildActions(ctx ModuleContext) {

	sourcePath := t.prebuilt.SingleSourcePath(ctx)

	installedPath := PathForModuleOut(ctx, t.ModuleBase.Name())

	deps := PathsForModuleSrc(ctx, t.properties.Deps)



	relPath, err := filepath.Rel(path.Dir(installedPath.String()), sourcePath.String())

	if err != nil {

		ctx.ModuleErrorf("Unabled to generate symlink between %q and %q: %s", installedPath.String(), sourcePath.String())

	}



	ctx.Build(pctx, BuildParams{

		Rule:      Symlink,

		Output:    installedPath,

		Input:     sourcePath,

		Implicits: deps,

		Args: map[string]string{

			"fromPath": relPath,

		},

	})



	t.toolPath = OptionalPathForPath(installedPath)

}



func (t *prebuiltBuildTool) HostToolPath() OptionalPath {

	return t.toolPath

}



var _ HostToolProvider = &prebuiltBuildTool{}



// prebuilt_build_tool is to declare prebuilts to be used during the build, particularly for use

// in genrules with the "tools" property.

func prebuiltBuildToolFactory() Module {

	module := &prebuiltBuildTool{}

	module.AddProperties(&module.properties)

	InitSingleSourcePrebuiltModule(module, &module.properties, "Src")

	InitAndroidArchModule(module, HostSupportedNoCross, MultilibFirst)

	return module

}