diff options
| author | 2025-02-12 16:58:40 -0800 | |
|---|---|---|
| committer | 2025-02-12 16:58:40 -0800 | |
| commit | e8c48462a67072778d633975a0d1577914d1f0e2 (patch) | |
| tree | 758502cb2da1699f4bab9f11ea71bbd64fdb035d /aconfig | |
| parent | f8ea8c896c9017ea93c62bfcb33ba50172e21293 (diff) | |
| parent | 6d7a9ced476dfb560319d9ee634365a7d08299c7 (diff) | |
Merge "Move dist rule of all_aconfig_declarations_extension to GenerateAndroidBuildActions" into main am: bcee87a97c am: 6d7a9ced47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3492156
Change-Id: I7feb30500fbcf1b0ea8a4f6dd71911ae8cba4169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'aconfig')
| -rw-r--r-- | aconfig/all_aconfig_declarations_extension.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/aconfig/all_aconfig_declarations_extension.go b/aconfig/all_aconfig_declarations_extension.go index 44992cd2a..d5a458811 100644 --- a/aconfig/all_aconfig_declarations_extension.go +++ b/aconfig/all_aconfig_declarations_extension.go @@ -79,12 +79,10 @@ func (ext *allAconfigDeclarationsExtension) GenerateAndroidBuildActions(ctx andr ctx.Phony(ctx.ModuleName(), ext.finalizedFlags) + ctx.DistForGoalWithFilename("sdk", ext.finalizedFlags, path.Join(proptools.String(ext.properties.Dist_dir), "finalized-flags.txt")) + // This module must not set any provider or call `ctx.SetOutputFiles`! // This module is only used to depend on the singleton module all_aconfig_declarations and // generate the custom finalized-flags.txt file in dist builds, and should not be depended // by other modules. } - -func (ext *allAconfigDeclarationsExtension) MakeVars(ctx android.MakeVarsContext) { - ctx.DistForGoalWithFilename("sdk", ext.finalizedFlags, path.Join(proptools.String(ext.properties.Dist_dir), "finalized-flags.txt")) -} |