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

Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 am: a1b17990dd am: 2b93f0cfb9 am: b308573038

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

Change-Id: I9ddc11a7d2b7274325c2abe755e5b85c3eeb28c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-21 05:58:45 +00:00
committed by Automerger Merge Worker
parent 4e06f6bbb2 b308573038
commit 7a3a115e31
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/app.go
View File

@@ -31,6 +31,7 @@ import (
"android/soong/dexpreopt" "android/soong/dexpreopt"
"android/soong/genrule" "android/soong/genrule"
"android/soong/tradefed" "android/soong/tradefed"
"android/soong/ui/metrics/bp2build_metrics_proto"
) )
func init() { func init() {
@@ -1639,6 +1640,21 @@ func convertWithBp2build(ctx android.Bp2buildMutatorContext, a *AndroidApp) (boo
if !supported { if !supported {
return false, android.CommonAttributes{}, &bazelAndroidAppAttributes{} return false, android.CommonAttributes{}, &bazelAndroidAppAttributes{}
} }
if a.appProperties.Jni_uses_platform_apis != nil {
ctx.MarkBp2buildUnconvertible(
bp2build_metrics_proto.UnconvertedReasonType_UNSUPPORTED,
"TODO - b/299360988: Add bp2build support for jni_uses_platform_apis",
)
return false, android.CommonAttributes{}, &bazelAndroidAppAttributes{}
}
if a.appProperties.Jni_uses_sdk_apis != nil {
ctx.MarkBp2buildUnconvertible(
bp2build_metrics_proto.UnconvertedReasonType_UNSUPPORTED,
"TODO - b/299360988: Add bp2build support for jni_uses_sdk_apis",
)
return false, android.CommonAttributes{}, &bazelAndroidAppAttributes{}
}
certificate, certificateName := android.BazelStringOrLabelFromProp(ctx, a.overridableAppProperties.Certificate) certificate, certificateName := android.BazelStringOrLabelFromProp(ctx, a.overridableAppProperties.Certificate)
manifestValues := &manifestValueAttribute{} manifestValues := &manifestValueAttribute{}