StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "gen_parsers_and_formatters.rs is no longer generated." into main am: 119bb1b21d

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

Change-Id: I852c85cc971928199dc2a60a6e5611410bdc1d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-03-14 17:59:18 +00:00
committed by Automerger Merge Worker
parent 452797c6f7 119bb1b21d
commit d68add9fb9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sysprop/sysprop_library.go
View File

@@ -157,12 +157,11 @@ func (g *syspropRustGenRule) GenerateAndroidBuildActions(ctx android.ModuleConte
syspropDir := android.GenPathWithExt(ctx, "sysprop", syspropFile, "srcrust") syspropDir := android.GenPathWithExt(ctx, "sysprop", syspropFile, "srcrust")
outputDir := syspropDir.Join(ctx, "src") outputDir := syspropDir.Join(ctx, "src")
libPath := syspropDir.Join(ctx, "src", "lib.rs") libPath := syspropDir.Join(ctx, "src", "lib.rs")
parsersPath := syspropDir.Join(ctx, "src", "gen_parsers_and_formatters.rs")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: syspropRust, Rule: syspropRust,
Description: "sysprop_rust " + syspropFile.Rel(), Description: "sysprop_rust " + syspropFile.Rel(),
Outputs: android.WritablePaths{libPath, parsersPath}, Outputs: android.WritablePaths{libPath},
Input: syspropFile, Input: syspropFile,
Implicit: checkApiFileTimeStamp, Implicit: checkApiFileTimeStamp,
Args: map[string]string{ Args: map[string]string{
@@ -171,7 +170,7 @@ func (g *syspropRustGenRule) GenerateAndroidBuildActions(ctx android.ModuleConte
}, },
}) })
g.genSrcs = append(g.genSrcs, libPath, parsersPath) g.genSrcs = append(g.genSrcs, libPath)
} }
} }