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

Commit 84f1b808 authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

No matching variant android_app_import fix 

This fixes a bug where android_app_import or android_test_import without
a matching variant or a default apk property value breaks the build.

Test: app_test.go
Fixes: 152343232
Change-Id: I8215aa1a6dad74b503eaa1169a64f8c30dda287c
parent 2ba87f46

android/prebuilt.go

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ func InitSingleSourcePrebuiltModule(module PrebuiltInterface, srcProps interface 
	srcPropertyName := proptools.PropertyNameForField(srcField)



	srcsSupplier := func(ctx BaseModuleContext) []string {

		if !ctx.Module().Enabled() {

			return nil

		}

		value := srcPropsValue.FieldByIndex(srcFieldIndex)

		if value.Kind() == reflect.Ptr {

			value = value.Elem()

java/app.go

+7 −0
Original line number Diff line number Diff line
@@ -1400,6 +1400,13 @@ func (a *AndroidAppImport) processVariants(ctx android.LoadHookContext) { 
	archProps := reflect.ValueOf(a.archVariants).Elem().FieldByName("Arch")

	archType := ctx.Config().AndroidFirstDeviceTarget.Arch.ArchType

	MergePropertiesFromVariant(ctx, &a.properties, archProps, archType.Name)



	if String(a.properties.Apk) == "" {

		// Disable this module since the apk property is still empty after processing all matching

		// variants. This likely means there is no matching variant, and the default variant doesn't

		// have an apk property value either.

		a.Disable()

	}

}



func MergePropertiesFromVariant(ctx android.EarlyModuleContext,

java/app_test.go

+24 −0
Original line number Diff line number Diff line
@@ -2524,6 +2524,24 @@ func TestAndroidAppImport_ArchVariants(t *testing.T) { 
			`,

			expected: "prebuilts/apk/app.apk",

		},

		{

			name: "no matching arch without default",

			bp: `

				android_app_import {

					name: "foo",

					arch: {

						arm: {

							apk: "prebuilts/apk/app_arm.apk",

						},

					},

					presigned: true,

					dex_preopt: {

						enabled: true,

					},

				}

			`,

			expected: "",

		},

	}



	jniRuleRe := regexp.MustCompile("^if \\(zipinfo (\\S+)")
@@ -2531,6 +2549,12 @@ func TestAndroidAppImport_ArchVariants(t *testing.T) { 
		ctx, _ := testJava(t, test.bp)



		variant := ctx.ModuleForTests("foo", "android_common")

		if test.expected == "" {

			if variant.Module().Enabled() {

				t.Error("module should have been disabled, but wasn't")

			}

			continue

		}

		jniRuleCommand := variant.Output("jnis-uncompressed/foo.apk").RuleParams.Command

		matches := jniRuleRe.FindStringSubmatch(jniRuleCommand)

		if len(matches) != 2 {