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

Merge "Clean up some bp2build technical debt"

Browse Source
This commit is contained in:
Treehugger Robot
2022-05-23 18:01:04 +00:00
committed by Gerrit Code Review
parent d9d096ec7c 3bf97bd1c0
commit 5bec8d41ea
10 changed files with 9 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java.go
View File

@@ -1247,10 +1247,10 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) {
if ctx.Arch().ArchType == android.Common || ctx.BazelConversionMode() {
if ctx.Arch().ArchType == android.Common {
j.deps(ctx)
}
if ctx.Arch().ArchType != android.Common || ctx.BazelConversionMode() {
if ctx.Arch().ArchType != android.Common {
// 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...)