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

Commit 899c23e1 authored by Dan Albert's avatar Dan Albert
Browse files

Add flag to disable source directory includes. 

Not all projects can be built when their base directory (the
directory containing the Android.bp file) is automatically included.
For example, external/jsoncpp has a file named version, which will
override the standard library's <version> header.

It would maybe be reasonable for this to be on by default, but many
projects in the tree currently depend on this behavior.

Test: make checkbuild
Bug: None
Change-Id: I58dff2689270ae56fef7cf83be31262d16794fc4
parent 080c2455

cc/compiler.go

+9 −2
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ type BaseCompilerProperties struct { 
	// be added to the include path using -I

	Local_include_dirs []string `android:"arch_variant,variant_prepend"`



	// Add the directory containing the Android.bp file to the list of include

	// directories. Defaults to true.

	Include_build_directory *bool



	// list of generated sources to compile. These are the names of gensrcs or

	// genrule modules.

	Generated_sources []string `android:"arch_variant"`
@@ -288,8 +292,11 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
		flags.YasmFlags = append(flags.YasmFlags, f)

	}



	if compiler.Properties.Include_build_directory == nil ||

		*compiler.Properties.Include_build_directory {

		flags.GlobalFlags = append(flags.GlobalFlags, "-I"+android.PathForModuleSrc(ctx).String())

		flags.YasmFlags = append(flags.YasmFlags, "-I"+android.PathForModuleSrc(ctx).String())

	}



	if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {

		flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,