StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete aliases to prebuilts

Browse Source 
These tools will now be built from source using rules_go

Test: TH
Bug: 284483729
Change-Id: I6dde9f1418aaa516c4c6f8c8897dd20f4becfb51
This commit is contained in:
Spandan Das
2023-06-14 17:56:10 +00:00
parent af4ccaaf41
commit 2a55cea4a0
3 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bp2build/build_conversion.go
View File

@@ -471,17 +471,6 @@ func generateBazelTargetsGoBinary(ctx *android.Context, g *bootstrap.GoBinary, g
return []BazelTarget{binTarget}, nil
}
var (
// TODO - b/284483729: Remove this denyilst
// Temporary denylist of go binaries that are currently used in mixed builds
// This denylist allows us to rollout bp2build converters for go targets without affecting mixed builds
goBinaryDenylist = []string{
"soong_zip",
"zip2zip",
"bazel_notice_gen",
}
)
func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (conversionResults, []error) {
buildFileToTargets := make(map[string]BazelTargets)
@@ -574,7 +563,7 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers
targets, targetErrs = generateBazelTargetsGoPackage(bpCtx, glib, nameToGoLibMap)
errs = append(errs, targetErrs...)
metrics.IncrementRuleClassCount("go_library")
} else if gbin, ok := m.(*bootstrap.GoBinary); ok && !android.InList(m.Name(), goBinaryDenylist) {
} else if gbin, ok := m.(*bootstrap.GoBinary); ok {
targets, targetErrs = generateBazelTargetsGoBinary(bpCtx, gbin, nameToGoLibMap)
errs = append(errs, targetErrs...)
metrics.IncrementRuleClassCount("go_binary")

18
cmd/zip2zip/BUILD.bazel
View File

@@ -1,18 +0,0 @@
# Copyright (C) 2022 The Android Open Source Project
#
# 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.
alias(
name = "zip2zip",
actual = "//prebuilts/build-tools:linux-x86/bin/zip2zip",
)

20
zip/cmd/BUILD.bazel
View File

@@ -1,20 +0,0 @@
# Copyright (C) 2022 The Android Open Source Project
#
# 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.
# TODO(b/194644518): Switch to the source version when Bazel can build go
# binaries.
alias(
name = "soong_zip",
actual = "//prebuilts/build-tools:linux-x86/bin/soong_zip",
)