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

Commit 7dcbf427 authored by LaMont Jones's avatar LaMont Jones Committed by Gerrit Code Review
Browse files

Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main

parents 3ad4cf3a c71f79e3

cc/androidmk.go

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { 
					entries.SetString("SOONG_SDK_VARIANT_MODULES",

						"$(SOONG_SDK_VARIANT_MODULES) $(patsubst %.sdk,%,$(LOCAL_MODULE))")

				}

				// TODO(b/311155208): The container here should be system.

				entries.SetOptionalPaths("LOCAL_ACONFIG_FILES", c.getTransitiveAconfigFiles(""))

			},

		},

		ExtraFooters: []android.AndroidMkExtraFootersFunc{

cc/cc.go

+4 −0
Original line number Diff line number Diff line
@@ -2345,6 +2345,10 @@ func (c *Module) maybeUnhideFromMake() { 
	}

}



func (c *Module) getTransitiveAconfigFiles(container string) []android.Path {

	return c.transitiveAconfigFiles[container].ToList()

}



// maybeInstall is called at the end of both GenerateAndroidBuildActions and

// ProcessBazelQueryResponse to run the install hooks for installable modules,

// like binaries and tests.