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

Commit d48f3c38 authored by Jooyung Han's avatar Jooyung Han
Browse files

soong: Add tests for depending on disabled module 

This will check if direct deps of android.Module type is "Enabled()".
Previously, this is checked only if a module calls VisitDeps*()
functions in GenerateAndroidBuildActions().

Most modules call VisitDeps*() in GenerateAndroidBuildActions(),
but some modules don't. For example, "apex" module calls
WalkDepsBlueprint() or VisitDirectDepsBlueprint() since it
exceptionally depends on non-android.Module modules.

Therefore, when an apex module depends on disabled(enabled:false) module,
build fails with panic, which is fixed by this change.

Test: m # runs soong tests
Change-Id: I81c5c148bbd51a253d2904690eb76ae7b6df1a0f
parent 577d147e

android/module.go

+7 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,13 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) 
	}



	if m.Enabled() {

		// ensure all direct android.Module deps are enabled

		ctx.VisitDirectDepsBlueprint(func(bm blueprint.Module) {

			if _, ok := bm.(Module); ok {

				ctx.validateAndroidModule(bm, ctx.baseModuleContext.strictVisitDeps)

			}

		})



		notice := proptools.StringDefault(m.commonProperties.Notice, "NOTICE")

		if module := SrcIsModule(notice); module != "" {

			m.noticeFile = ctx.ExpandOptionalSource(&notice, "notice")

android/module_test.go

+55 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 


package android



import "testing"

import (

	"testing"

)



func TestSrcIsModule(t *testing.T) {

	type args struct {
@@ -139,3 +141,55 @@ func TestSrcIsModuleWithTag(t *testing.T) { 
		})

	}

}



type depsModule struct {

	ModuleBase

	props struct {

		Deps []string

	}

}



func (m *depsModule) GenerateAndroidBuildActions(ctx ModuleContext) {

}



func (m *depsModule) DepsMutator(ctx BottomUpMutatorContext) {

	ctx.AddDependency(ctx.Module(), nil, m.props.Deps...)

}



func depsModuleFactory() Module {

	m := &depsModule{}

	m.AddProperties(&m.props)

	InitAndroidModule(m)

	return m

}



func TestErrorDependsOnDisabledModule(t *testing.T) {

	ctx := NewTestContext()

	ctx.RegisterModuleType("deps", ModuleFactoryAdaptor(depsModuleFactory))



	bp := `

		deps {

			name: "foo",

			deps: ["bar"],

		}

		deps {

			name: "bar",

			enabled: false,

		}

	`



	mockFS := map[string][]byte{

		"Android.bp": []byte(bp),

	}



	ctx.MockFileSystem(mockFS)



	ctx.Register()



	config := TestConfig(buildDir, nil)



	_, errs := ctx.ParseFileList(".", []string{"Android.bp"})

	FailIfErrored(t, errs)

	_, errs = ctx.PrepareBuildActions(config)

	FailIfNoMatchingErrors(t, `module "foo": depends on disabled module "bar"`, errs)

}

apex/apex_test.go

+45 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,51 @@ func TestApexUsesFailsIfUseNoApex(t *testing.T) { 


}



func TestErrorsIfDepsAreNotEnabled(t *testing.T) {

	testApexError(t, `module "myapex" .* depends on disabled module "libfoo"`, `

		apex {

			name: "myapex",

			key: "myapex.key",

			native_shared_libs: ["libfoo"],

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		cc_library {

			name: "libfoo",

			stl: "none",

			system_shared_libs: [],

			enabled: false,

		}

	`)

	testApexError(t, `module "myapex" .* depends on disabled module "myjar"`, `

		apex {

			name: "myapex",

			key: "myapex.key",

			java_libs: ["myjar"],

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		java_library {

			name: "myjar",

			srcs: ["foo/bar/MyClass.java"],

			sdk_version: "none",

			system_modules: "none",

			compile_dex: true,

			enabled: false,

		}

	`)

}



func TestMain(m *testing.M) {

	run := func() int {

		setUp()

cc/cc_test.go

+18 −0
Original line number Diff line number Diff line
@@ -2264,6 +2264,24 @@ func TestStaticDepsOrderWithStubs(t *testing.T) { 
	}

}



func TestErrorsIfAModuleDependsOnDisabled(t *testing.T) {

	testCcError(t, `module "libA" .* depends on disabled module "libB"`, `

		cc_library {

			name: "libA",

			srcs: ["foo.c"],

			shared_libs: ["libB"],

			stl: "none",

		}



		cc_library {

			name: "libB",

			srcs: ["foo.c"],

			enabled: false,

			stl: "none",

		}

	`)

}



// Simple smoke test for the cc_fuzz target that ensures the rule compiles

// correctly.

func TestFuzzTarget(t *testing.T) {