diff options
-rw-r--r-- | apex/builder.go | 2 | ||||
-rw-r--r-- | cc/builder.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apex/builder.go b/apex/builder.go index 24c049bcd..148f42f09 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -761,7 +761,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { rule := java.Signapk args := map[string]string{ "certificates": pem.String() + " " + key.String(), - "flags": "-a 4096", //alignment + "flags": "-a 4096 --align-file-size", //alignment } implicits := android.Paths{pem, key} if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_SIGNAPK") { diff --git a/cc/builder.go b/cc/builder.go index b0842ec72..842ce8515 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -237,7 +237,7 @@ var ( // -w has been added since header-abi-dumper does not need to produce any sort of diagnostic information. sAbiDump, sAbiDumpRE = pctx.RemoteStaticRules("sAbiDump", blueprint.RuleParams{ - Command: "rm -f $out && $reTemplate$sAbiDumper -o ${out} $in $exportDirs -- $cFlags -w -isystem prebuilts/clang-tools/${config.HostPrebuiltTag}/clang-headers", + Command: "rm -f $out && $reTemplate$sAbiDumper --root-dir . --root-dir $$OUT_DIR:out -o ${out} $in $exportDirs -- $cFlags -w -isystem prebuilts/clang-tools/${config.HostPrebuiltTag}/clang-headers", CommandDeps: []string{"$sAbiDumper"}, }, &remoteexec.REParams{ Labels: map[string]string{"type": "abi-dump", "tool": "header-abi-dumper"}, @@ -255,7 +255,7 @@ var ( // sAbi dump file. sAbiLink, sAbiLinkRE = pctx.RemoteStaticRules("sAbiLink", blueprint.RuleParams{ - Command: "$reTemplate$sAbiLinker -o ${out} $symbolFilter -arch $arch $exportedHeaderFlags @${out}.rsp ", + Command: "$reTemplate$sAbiLinker --root-dir . --root-dir $$OUT_DIR:out -o ${out} $symbolFilter -arch $arch $exportedHeaderFlags @${out}.rsp", CommandDeps: []string{"$sAbiLinker"}, Rspfile: "${out}.rsp", RspfileContent: "${in}", |