diff options
| author | 2025-01-28 12:29:52 -0800 | |
|---|---|---|
| committer | 2025-01-28 13:01:42 -0800 | |
| commit | 099b863512d6ca09caeff5d7e60a3a3ce2cf3d8b (patch) | |
| tree | ff19e0c6543eb3387ccf5e2d4cdac6bb7251db15 /java/builder.go | |
| parent | d406381eadbbd411833a3e6829c9f2ade29da7ba (diff) | |
Fix sharded-jarjar output path
Make sure to use a relative path.
Flag: EXEMPT trivial bugfix
Bug: 383559945
Test: $ANDROID_BUILD_TOP/development/tools/ndk/update_ndk_abi.sh
# only make sure ninja-gen works
Test: OUT_DIR=$ANDROID_BUILD_TOP/out m nothing --no-skip-soong-tests
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh -s
Test: treehugger
Change-Id: I3f2c097f9a8a047133e9bc246df38549b922507a
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/builder.go b/java/builder.go index f1d5e9944..22dad103b 100644 --- a/java/builder.go +++ b/java/builder.go @@ -750,9 +750,9 @@ func TransformJarToR8Rules(ctx android.ModuleContext, outputFile android.Writabl jar android.Path) { ctx.Build(pctx, android.BuildParams{ - Rule: extractR8Rules, - Output: outputFile, - Input: jar, + Rule: extractR8Rules, + Output: outputFile, + Input: jar, }) } @@ -796,7 +796,7 @@ func TransformJarJarWithShards(ctx android.ModuleContext, outputFile android.Wri totalStr := strconv.Itoa(totalShards) for i := 0; i < totalShards; i++ { iStr := strconv.Itoa(i) - tempOut := android.PathForOutput(ctx, outputFile.String()+"-"+iStr+".jar") + tempOut := outputFile.ReplaceExtension(ctx, "-"+iStr+".jar") ctx.Build(pctx, android.BuildParams{ Rule: jarjar, Description: "jarjar (" + iStr + "/" + totalStr + ")", |