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

Commit f0095f30 authored Sep 10, 2020 by Jan Altensen

soong: allow overriding header files

Includes:

  Author: Jan Altensen <info@stricted.net>
  Date:   Sat Aug 7 19:41:59 2021 +0200

    soong: move header override to compiler.go

     * library.go only covers libraries

    Change-Id: I3374999d6b364dd1bbc2060996964ee7b04493e7

Change-Id: Ia9d2210605c5927b529fbe9485b0e5abd079f487

parent d370b36f

android/config.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -1120,6 +1120,10 @@ func (c *deviceConfig) DeviceKernelHeaderDirs() []string {
		return c.config.productVariables.DeviceKernelHeaders
		}

		func (c *deviceConfig) TargetSpecificHeaderPath() string {
		return String(c.config.productVariables.TargetSpecificHeaderPath)
		}

		func (c *deviceConfig) SamplingPGO() bool {
		return Bool(c.config.productVariables.SamplingPGO)
		}

android/variable.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -300,6 +300,8 @@ type productVariables struct {

		DeviceKernelHeaders []string `json:",omitempty"`

		TargetSpecificHeaderPath *string `json:",omitempty"`

		ExtraVndkVersions []string `json:",omitempty"`

		NamespacesToExport []string `json:",omitempty"`

cc/compiler.go

+10 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,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...)