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

Merge "bp2build java_libraries depend on Android SDK" am: 1b8942d4c8 am: 75249f9ed9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1997330

Change-Id: I6a2d8988a3ab91a64bfa2f731dec5bf7695bde62
This commit is contained in:
Sam Delmerico
2022-03-07 21:02:02 +00:00
committed by Automerger Merge Worker
parent ca1fe3f6df 75249f9ed9
commit 16efeb08ee
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bp2build/android_app_conversion_test.go
View File

@@ -51,6 +51,7 @@ android_app {
"srcs": `["app.java"]`, "srcs": `["app.java"]`,
"manifest": `"AndroidManifest.xml"`, "manifest": `"AndroidManifest.xml"`,
"resource_files": `["res/res.png"]`, "resource_files": `["res/res.png"]`,
"deps": `["//prebuilts/sdk:public_current_android_sdk_java_import"]`,
}), }),
}}) }})
} }
@@ -86,7 +87,10 @@ android_app {
"resb/res.png", "resb/res.png",
]`, ]`,
"custom_package": `"com.google"`, "custom_package": `"com.google"`,
"deps": `[":static_lib_dep"]`, "deps": `[
"//prebuilts/sdk:public_current_android_sdk_java_import",
":static_lib_dep",
]`,
}), }),
}}) }})
} }

5
java/java.go
View File

@@ -2030,6 +2030,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
} }
var deps bazel.LabelList var deps bazel.LabelList
sdkVersion := m.SdkVersion(ctx)
if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel {
// TODO(b/220869005) remove forced dependency on current public android.jar
deps.Add(&bazel.Label{Label: "//prebuilts/sdk:public_current_android_sdk_java_import"})
}
if m.properties.Libs != nil { if m.properties.Libs != nil {
deps.Append(android.BazelLabelForModuleDeps(ctx, m.properties.Libs)) deps.Append(android.BazelLabelForModuleDeps(ctx, m.properties.Libs))
} }