Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e0a880f authored by Spandan Das's avatar Spandan Das
Browse files

Mark android apps with jni_uses_*_apis as unconvertible 

These properties are used to determine if the app should include the sdk
variant of jni libs. Till we support this, mark androi_app/android_test
that set this property as uncovertible in allowlist v2

Bug: 299360988
Test: created a test app in an android.bp and verified that an
equivalent target is not created if either of these props are set

Change-Id: I925745d2667866a12b71788dc8f1bb1e1f3472cc
parent 52d1cc33

java/app.go

+16 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import ( 
	"android/soong/dexpreopt"

	"android/soong/genrule"

	"android/soong/tradefed"

	"android/soong/ui/metrics/bp2build_metrics_proto"

)



func init() {
@@ -1639,6 +1640,21 @@ func convertWithBp2build(ctx android.Bp2buildMutatorContext, a *AndroidApp) (boo 
	if !supported {

		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)



	manifestValues := &manifestValueAttribute{}