Merge "Mixed builds: propagate includes from cc_* targets" (1c4621af) · Commits · e / os / android_build_soong

android/bazel.go

+3 −4

Original line number	Diff line number	Diff line
		@@ -221,7 +221,6 @@ var (
		// Per-module denylist to opt modules out of mixed builds. Such modules will
		// still be generated via bp2build.
		mixedBuildsDisabledList = []string{
		"libasync_safe", // lberki@, cc_library_static, 'async_safe/log.h not found' for out/combined-aosp_arm64.ninja out/soong/.intermediates/system/unwinding/libbacktrace/libbacktrace/android_arm64_armv8-a_shared/obj/system/unwinding/libbacktrace/ThreadEntry.o
		"libc_gdtoa", // ruperts@, cc_library_static, OK for bp2build but undefined symbol: __strtorQ for mixed builds
		"libc_netbsd", // lberki@, cc_library_static, version script assignment of 'LIBC_PRIVATE' to symbol 'SHA1Final' failed: symbol not defined
		"libc_openbsd", // ruperts@, cc_library_static, OK for bp2build but error: duplicate symbol: strcpy for mixed builds

+13 −4

Original line number	Diff line number	Diff line
		@@ -402,10 +402,17 @@ func (f *flagExporter) addExportedGeneratedHeaders(headers ...android.Path) {

		func (f *flagExporter) setProvider(ctx android.ModuleContext) {
		ctx.SetProvider(FlagExporterInfoProvider, FlagExporterInfo{
		// Comes from Export_include_dirs property, and those of exported transitive deps
		IncludeDirs: android.FirstUniquePaths(f.dirs),
		// Comes from Export_system_include_dirs property, and those of exported transitive deps
		SystemIncludeDirs: android.FirstUniquePaths(f.systemDirs),
		// Used in very few places as a one-off way of adding extra defines.
		Flags: f.flags,
		// Used sparingly, for extra files that need to be explicitly exported to dependers,
		// or for phony files to minimize ninja.
		Deps: f.deps,
		// For exported generated headers, such as exported aidl headers, proto headers, or
		// sysprop headers.
		GeneratedHeaders: f.headers,
		})
		}
		@@ -524,6 +531,8 @@ func (handler *staticLibraryBazelHandler) generateBazelBuildActions(ctx android.
		Direct(outputFilePath).
		Build(),
		})

		ctx.SetProvider(FlagExporterInfoProvider, flagExporterInfoFromCcInfo(ctx, ccInfo))
		if i, ok := handler.module.linker.(snapshotLibraryInterface); ok {
		// Dependencies on this library will expect collectedSnapshotHeaders to
		// be set, otherwise validation will fail. For now, set this to an empty

+2 −2

Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ func flagExporterInfoFromCcInfo(ctx android.ModuleContext, ccInfo cquery.CcInfo)
		systemIncludes := android.PathsForBazelOut(ctx, ccInfo.SystemIncludes)

		return FlagExporterInfo{
		IncludeDirs: includes,
		SystemIncludeDirs: systemIncludes,
		IncludeDirs: android.FirstUniquePaths(includes),
		SystemIncludeDirs: android.FirstUniquePaths(systemIncludes),
		}
		}