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

Verified Commit 2c546497 authored Aug 07, 2021 by Jan Altensen

soong: move header override to compiler.go

 * library.go only covers libraries

Change-Id: I3374999d6b364dd1bbc2060996964ee7b04493e7

parent c539857b

cc/compiler.go

+10 −0

Original line number	Diff line number	Diff line
		@@ -257,6 +257,16 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
		tc := ctx.toolchain()
		modulePath := android.PathForModuleSrc(ctx).String()

		additionalIncludeDirs := ctx.DeviceConfig().TargetSpecificHeaderPath()
		if len(additionalIncludeDirs) > 0 {
		// devices can have multiple paths in TARGET_SPECIFIC_HEADER_PATH
		// add -I in front of all of them
		if (strings.Contains(additionalIncludeDirs, " ")) {
		additionalIncludeDirs = strings.ReplaceAll(additionalIncludeDirs, " ", " -I")
		}
		flags.Local.CommonFlags = append(flags.Local.CommonFlags, "-I" + additionalIncludeDirs)
		}

		compiler.srcsBeforeGen = android.PathsForModuleSrcExcludes(ctx, compiler.Properties.Srcs, compiler.Properties.Exclude_srcs)
		compiler.srcsBeforeGen = append(compiler.srcsBeforeGen, deps.GeneratedSources...)

cc/library.go

+0 −10

Original line number	Diff line number	Diff line
		@@ -546,16 +546,6 @@ func (library *libraryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Fla
		}

		func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags, deps PathDeps) Flags {
		additionalIncludeDirs := ctx.DeviceConfig().TargetSpecificHeaderPath()
		if len(additionalIncludeDirs) > 0 {
		// devices can have multiple paths in TARGET_SPECIFIC_HEADER_PATH
		// add -I in front of all of them
		if (strings.Contains(additionalIncludeDirs, " ")) {
		additionalIncludeDirs = strings.ReplaceAll(additionalIncludeDirs, " ", " -I")
		}
		flags.Local.CommonFlags = append(flags.Local.CommonFlags, "-I" + additionalIncludeDirs)
		}

		exportIncludeDirs := library.flagExporter.exportedIncludes(ctx)
		if len(exportIncludeDirs) > 0 {
		f := includeDirsToFlags(exportIncludeDirs)