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

Commit 38a72e71 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "cosmetic: unused argument" into main

parents 7660e718 40caf950

bp2build/bp2build.go

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ func Codegen(ctx *CodegenContext) *CodegenMetrics { 
	}

	var bp2buildFiles []BazelFile

	ctx.Context().EventHandler.Do("CreateBazelFile", func() {

		bp2buildFiles = CreateBazelFiles(ctx.Config(), nil, res.buildFileToTargets, ctx.mode)

		bp2buildFiles = CreateBazelFiles(nil, res.buildFileToTargets, ctx.mode)

	})

	injectionFiles, additionalBp2buildFiles, err := CreateSoongInjectionDirFiles(ctx, res.metrics)

	if err != nil {

bp2build/bzl_conversion_test.go

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ func TestGenerateSoongModuleBzl(t *testing.T) { 
			content: "irrelevant",

		},

	}

	files := CreateBazelFiles(android.NullConfig("out", "out/soong"), ruleShims, make(map[string]BazelTargets), QueryView)

	files := CreateBazelFiles(ruleShims, make(map[string]BazelTargets), QueryView)



	var actualSoongModuleBzl BazelFile

	for _, f := range files {

bp2build/conversion.go

+3 −9
Original line number Diff line number Diff line 
package bp2build



import (

	"android/soong/starlark_fmt"

	"encoding/json"

	"fmt"

	"reflect"
@@ -9,11 +8,11 @@ import ( 
	"strings"



	"android/soong/android"

	"android/soong/apex"

	"android/soong/cc"

	cc_config "android/soong/cc/config"

	java_config "android/soong/java/config"



	"android/soong/apex"

	"android/soong/starlark_fmt"



	"github.com/google/blueprint/proptools"

)
@@ -105,12 +104,7 @@ platform_versions = struct( 
`, starlark_fmt.PrintBool(cfg.PlatformSdkFinal()), platformSdkVersion, cfg.PlatformSdkCodename(), strings.Join(platformVersionActiveCodenames, ", "))

}



func CreateBazelFiles(

	cfg android.Config,

	ruleShims map[string]RuleShim,

	buildToTargets map[string]BazelTargets,

	mode CodegenMode) []BazelFile {



func CreateBazelFiles(ruleShims map[string]RuleShim, buildToTargets map[string]BazelTargets, mode CodegenMode) []BazelFile {

	var files []BazelFile



	if mode == QueryView {

bp2build/conversion_test.go

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ type bazelFilepath struct { 
}



func TestCreateBazelFiles_QueryView_AddsTopLevelFiles(t *testing.T) {

	files := CreateBazelFiles(android.NullConfig("out", "out/soong"),

		map[string]RuleShim{}, map[string]BazelTargets{}, QueryView)

	files := CreateBazelFiles(map[string]RuleShim{}, map[string]BazelTargets{}, QueryView)

	expectedFilePaths := []bazelFilepath{

		{

			dir:      "",

cmd/soong_build/queryview.go

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
package main



import (

	"android/soong/starlark_import"

	"io/fs"

	"io/ioutil"

	"os"
@@ -23,6 +22,7 @@ import ( 


	"android/soong/android"

	"android/soong/bp2build"

	"android/soong/starlark_import"

)



// A helper function to generate a Read-only Bazel workspace in outDir
@@ -35,8 +35,7 @@ func createBazelWorkspace(ctx *bp2build.CodegenContext, outDir string, generateF 
		panic(err)

	}



	filesToWrite := bp2build.CreateBazelFiles(ctx.Config(), ruleShims, res.BuildDirToTargets(),

		ctx.Mode())

	filesToWrite := bp2build.CreateBazelFiles(ruleShims, res.BuildDirToTargets(), ctx.Mode())

	bazelRcFiles, err2 := CopyBazelRcFiles()

	if err2 != nil {

		return err2