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

Commit 355851b5 authored by Romain Jobredeaux's avatar Romain Jobredeaux
Browse files

Revert "Revert "Add static_libs support to android_app bp2build converter."" 

This reverts commit b33e0b8b.

Reason for revert: CI failure deemed to be a fluke

Change-Id: Ia804d531092921e4ad090740420c4a4e02e6ff00
parent b33e0b8b

android/bazel.go

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ var ( 
		"development/samples/USB/MissileLauncher":            Bp2BuildDefaultTrue,

		"development/samples/VoiceRecognitionService":        Bp2BuildDefaultTrue,

		"development/samples/VoicemailProviderDemo":          Bp2BuildDefaultTrue,

		"development/samples/WiFiDirectDemo":                 Bp2BuildDefaultTrue,

		"development/sdk":                                    Bp2BuildDefaultTrueRecursively,

		"external/arm-optimized-routines":                    Bp2BuildDefaultTrueRecursively,

		"external/boringssl":                                 Bp2BuildDefaultTrueRecursively,

bp2build/android_app_conversion_test.go

+3 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ func TestAndroidAppAllSupportedFields(t *testing.T) { 
			"resb/res.png":                 "",

			"manifest/AndroidManifest.xml": "",

		},

		blueprint: `

		blueprint: simpleModuleDoNotConvertBp2build("android_app", "static_lib_dep") + `

android_app {

        name: "TestApp",

        srcs: ["app.java"],
@@ -74,6 +74,7 @@ android_app { 
        package_name: "com.google",

        resource_dirs: ["resa", "resb"],

        manifest: "manifest/AndroidManifest.xml",

        static_libs: ["static_lib_dep"]

}

`,

		expectedBazelTargets: []string{
@@ -85,6 +86,7 @@ android_app { 
        "resb/res.png",

    ]`,

				"custom_package": `"com.google"`,

				"deps":           `[":static_lib_dep"]`,

			}),

		}})

}

java/app.go

+4 −0
Original line number Diff line number Diff line
@@ -1432,6 +1432,7 @@ type bazelAndroidAppAttributes struct { 
	Manifest       bazel.Label

	Custom_package *string

	Resource_files bazel.LabelListAttribute

	Deps           bazel.LabelListAttribute

}



// ConvertWithBp2build is used to convert android_app to Bazel.
@@ -1449,12 +1450,15 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) { 
		resourceFiles.Includes = append(resourceFiles.Includes, files...)

	}



	deps := bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, a.properties.Static_libs))



	attrs := &bazelAndroidAppAttributes{

		Srcs:     srcs,

		Manifest: android.BazelLabelForModuleSrcSingle(ctx, manifest),

		// TODO(b/209576404): handle package name override by product variable PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES

		Custom_package: a.overridableAppProperties.Package_name,

		Resource_files: bazel.MakeLabelListAttribute(resourceFiles),

		Deps:           deps,

	}

	props := bazel.BazelTargetModuleProperties{Rule_class: "android_binary",

		Bzl_load_location: "@rules_android//rules:rules.bzl"}