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

Commit b164b381 authored by Chris Parsons's avatar Chris Parsons
Browse files

Register bp2build module types even outside generation 

Without this fix, mixed builds are silently disabled, as a recent change
disabled mixed builds for all module types which are not listed in this
map. This map should be populated for both bp2build generation and for
mixed builds.

Test: lunch aosp_flame && USE_BAZEL_ANALYSIS=1 m libc
Change-Id: Ib2a3fb2de2e7a5204ef01355522ae569e0424dc7
parent 4f6d1546

android/bazel.go

+3 −1
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ var ( 
	}



	// Per-module denylist to always opt modules out.



	bp2buildModuleDoNotConvertList = []string{

		"generated_android_ids",

		"libBionicBenchmarksUtils",

		"libbionic_spawn_benchmark",

		"libc_jemalloc_wrapper",
@@ -170,6 +170,8 @@ var ( 
		"liblinker_debuggerd_stub",

		"libbionic_tests_headers_posix",

		"libc_dns",

		"note_memtag_heap_async",

		"note_memtag_heap_sync",

	}



	// Used for quicker lookups

android/register.go

+9 −0
Original line number Diff line number Diff line
@@ -192,6 +192,15 @@ func (ctx *Context) Register() { 
		t.register(ctx)

	}



	if ctx.config.BazelContext.BazelEnabled() {

		// Hydrate the configuration of bp2build-enabled module types. This is

		// required as a signal to identify which modules should be deferred to

		// Bazel in mixed builds, if it is enabled.

		for t, _ := range bp2buildMutators {

			ctx.config.bp2buildModuleTypeConfig[t] = true

		}

	}



	mutators := collateGloballyRegisteredMutators()

	mutators.registerAll(ctx)