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

Merge "bp2build: convert paths/module refs to Bazel label"

Browse Source
This commit is contained in:
Liz Kammer
2021-02-05 13:39:08 +00:00
committed by Gerrit Code Review
parent b89336487e 356f7d45c1
commit b7eab01167
27 changed files with 734 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -2687,9 +2687,10 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) {
if ctx.Arch().ArchType == android.Common {
if ctx.Arch().ArchType == android.Common || ctx.BazelConversionMode() {
j.deps(ctx)
} else {
}
if ctx.Arch().ArchType != android.Common || ctx.BazelConversionMode() {
// These dependencies ensure the host installation rules will install the jar file and
// the jni libraries when the wrapper is installed.
ctx.AddVariationDependencies(nil, jniInstallTag, j.binaryProperties.Jni_libs...)

2
java/proto.go
View File

@@ -82,7 +82,7 @@ func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) {
case "lite", "":
ctx.AddVariationDependencies(nil, staticLibTag, "libprotobuf-java-lite")
case "full":
if ctx.Host() {
if ctx.Host() || ctx.BazelConversionMode() {
ctx.AddVariationDependencies(nil, staticLibTag, "libprotobuf-java-full")
} else {
ctx.PropertyErrorf("proto.type", "full java protos only supported on the host")