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

Commit 4e965ebb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Improve cc tests by adding sanitizer mutators" am: 7d211f17 am: 152b5f86 am: 5b91dc8d 

Change-Id: Ife351bc2628c32e7473ead96097b6ebd325604ec
parents 504b300f 5b91dc8d

apex/apex_test.go

+0 −2
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr 


	ctx.RegisterModuleType("cc_library_shared", cc.LibrarySharedFactory)

	ctx.RegisterModuleType("cc_library_headers", cc.LibraryHeaderFactory)

	cc.RegisterPrebuiltBuildComponents(ctx)

	cc.RegisterRequiredBuildComponentsForTest(ctx)

	ctx.RegisterModuleType("cc_binary", cc.BinaryFactory)

	ctx.RegisterModuleType("cc_defaults", func() android.Module {
@@ -305,7 +304,6 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr 
	java.RegisterAppBuildComponents(ctx)



	ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)

	android.RegisterPrebuiltMutators(ctx)

	ctx.PreDepsMutators(RegisterPreDepsMutators)

	ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators)

	ctx.PostDepsMutators(RegisterPostDepsMutators)

cc/prebuilt_test.go

+0 −4
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ func TestPrebuilt(t *testing.T) { 


	ctx := CreateTestContext()



	RegisterPrebuiltBuildComponents(ctx)



	android.RegisterPrebuiltMutators(ctx)



	ctx.Register(config)



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

cc/testing.go

+14 −0
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ import ( 
)



func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {

	RegisterPrebuiltBuildComponents(ctx)

	ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)

	ctx.RegisterModuleType("cc_library", LibraryFactory)

	ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory)

	ctx.RegisterModuleType("cc_object", ObjectFactory)



	android.RegisterPrebuiltMutators(ctx)

	ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {

		ctx.BottomUp("vndk", VndkMutator).Parallel()

		ctx.BottomUp("link", LinkageMutator).Parallel()
@@ -33,6 +35,10 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { 
		ctx.BottomUp("begin", BeginMutator).Parallel()

		ctx.BottomUp("sysprop_cc", SyspropMutator).Parallel()

	})

	ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {

		ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator).Parallel()

		ctx.BottomUp("sanitize_runtime", sanitizerRuntimeMutator).Parallel()

	})

}



func GatherRequiredDepsForTest(os android.OsType) string {
@@ -114,6 +120,14 @@ func GatherRequiredDepsForTest(os android.OsType) string { 
			src: "",

		}



		// Needed for sanitizer

		cc_prebuilt_library_shared {

			name: "libclang_rt.ubsan_standalone-aarch64-android",

			vendor_available: true,

			recovery_available: true,

			srcs: [""],

		}



		toolchain_library {

			name: "libgcc",

			vendor_available: true,

java/java_test.go

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ func testContext() *android.TestContext { 
	RegisterDocsBuildComponents(ctx)

	RegisterStubsBuildComponents(ctx)

	RegisterSdkLibraryBuildComponents(ctx)

	android.RegisterPrebuiltMutators(ctx)

	ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)



	RegisterPrebuiltApisBuildComponents(ctx)

sdk/testing.go

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ func testSdkContext(bp string, fs map[string][]byte) (*android.TestContext, andr 
	ctx.PreArchMutators(android.RegisterVisibilityRuleGatherer)

	ctx.PostDepsMutators(android.RegisterVisibilityRuleEnforcer)



	android.RegisterPrebuiltMutators(ctx)

	ctx.RegisterModuleType("package", android.PackageFactory)



	// from java package
@@ -80,7 +79,6 @@ func testSdkContext(bp string, fs map[string][]byte) (*android.TestContext, andr 
	cc.RegisterRequiredBuildComponentsForTest(ctx)

	ctx.RegisterModuleType("cc_library_shared", cc.LibrarySharedFactory)

	ctx.RegisterModuleType("cc_library_static", cc.LibraryStaticFactory)

	cc.RegisterPrebuiltBuildComponents(ctx)



	// from apex package

	ctx.RegisterModuleType("apex", apex.BundleFactory)