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

Commit 729c0bdb authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Prebuilt is enabled even if the source one is not. 

This fix a bug in a recent android_app_import-related change
(I8215aa1a6dad74b503eaa1169a64f8c30dda287c) where it uses an incorrect
module reference, and so disables a prebuilt module if its source-based
counterpart is disabled.

Test: app_test.go
Bug: 152343232
Change-Id: Ic7f5ca40be58f06e44b5ec4945caf209ef2dae96
parent 0bc9a9ad

android/prebuilt.go

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



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

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

		if !module.Enabled() {

			return nil

		}

		value := srcPropsValue.FieldByIndex(srcFieldIndex)

java/app_test.go

+28 −0
Original line number Diff line number Diff line
@@ -2566,6 +2566,34 @@ func TestAndroidAppImport_ArchVariants(t *testing.T) { 
	}

}



func TestAndroidAppImport_overridesDisabledAndroidApp(t *testing.T) {

	ctx, _ := testJava(t, `

		android_app {

			name: "foo",

			srcs: ["a.java"],

			enabled: false,

		}

 

 		android_app_import {

			name: "foo",

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

			certificate: "platform",

			prefer: true,

		}

		`)



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

	a := variant.Module().(*AndroidAppImport)

	// The prebuilt module should still be enabled and active even if the source-based counterpart

	// is disabled.

	if !a.prebuilt.UsePrebuilt() {

		t.Errorf("prebuilt foo module is not active")

	}

	if !a.Enabled() {

		t.Errorf("prebuilt foo module is disabled")

	}

}



func TestAndroidTestImport(t *testing.T) {

	ctx, config := testJava(t, `

		android_test_import {