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

Commit b2f6d071 authored Dec 06, 2023 by LaMont Jones Committed by Automerger Merge Worker Dec 06, 2023

Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: I106ba9459c56890290f515fe2ccc617e9101cc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 630ed2bc 7dcbf427

cc/androidmk.go

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,8 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
	entries.SetString("SOONG_SDK_VARIANT_MODULES",		entries.SetString("SOONG_SDK_VARIANT_MODULES",
	"$(SOONG_SDK_VARIANT_MODULES) $(patsubst %.sdk,%,$(LOCAL_MODULE))")		"$(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{		ExtraFooters: []android.AndroidMkExtraFootersFunc{

cc/cc.go

+4 −0

Original line number	Original line	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		// maybeInstall is called at the end of both GenerateAndroidBuildActions and
	// ProcessBazelQueryResponse to run the install hooks for installable modules,		// ProcessBazelQueryResponse to run the install hooks for installable modules,
	// like binaries and tests.		// like binaries and tests.