Merge "Add flag to disable source directory includes." (3adf8b05) · Commits · e / os / android_build_soong

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,