diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2017-04-18 10:44:00 -0700 |
|---|---|---|
| committer | Jayant Chowdhary <jchowdhary@google.com> | 2017-04-18 10:50:31 -0700 |
| commit | 918b1d91050fa46e573d235e0ae9bad12ad375ab (patch) | |
| tree | 862d600967304f0f02f92ce10ae1f0c3daa931d7 | |
| parent | e87b768200fb1ea3a9a47645b3e4159d549c0b70 (diff) | |
| download | build_soong-918b1d91050fa46e573d235e0ae9bad12ad375ab.tar.gz build_soong-918b1d91050fa46e573d235e0ae9bad12ad375ab.tar.bz2 build_soong-918b1d91050fa46e573d235e0ae9bad12ad375ab.zip | |
Fix lots of warnings from abi dumping.
Also fix ndk libraries are always re-building. Fix this by having the
build system know the report's file path. This will need to be changed
once we go off "advisory mode" to keep the report if builds fail on abi
breakages.
Bug: 37451651
Bug: 37450828
Test: mm -j64 in bionic/libc produces abi-dumps without warning:
argument unused during compilation: '-Wa,--noexecstack'
Test: cd system/core/init; mma -j; NINJA_ARGS="-d explain" mma -j; The
second mma does not show a dirty libc.so.
Change-Id: I824723fd9e76586831ee2278db0b61329b1475c0
| -rw-r--r-- | cc/builder.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cc/builder.go b/cc/builder.go index 96b41589..81ecd73e 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -173,7 +173,7 @@ var ( sAbiDump = pctx.AndroidStaticRule("sAbiDump", blueprint.RuleParams{ - Command: "rm -f $out && $sAbiDumper -o ${out} $in $exportDirs -- $cFlags -Wno-packed -isystem ${config.RSIncludePath}", + Command: "rm -f $out && $sAbiDumper -o ${out} $in $exportDirs -- $cFlags -Wno-packed -Qunused-arguments -isystem ${config.RSIncludePath}", CommandDeps: []string{"$sAbiDumper"}, Description: "header-abi-dumper $in -o $out $exportDirs", }, @@ -192,13 +192,10 @@ var ( "symbolFile", "arch", "api", "exportedHeaderFlags") _ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-diff") - // The output file is different from what the build system knows about. - // This is done since we have to create a report file even when builds - // fail in this case. Abidiff check turned on in advice-only mode. Builds - // will not fail on abi incompatibilties / extensions. + // Abidiff check turned on in advice-only mode. Builds will not fail on abi incompatibilties / extensions. sAbiDiff = pctx.AndroidStaticRule("sAbiDiff", blueprint.RuleParams{ - Command: "$sAbiDiffer -advice-only -o ${out}s -new $in -old $referenceDump", + Command: "$sAbiDiffer -advice-only -o ${out} -new $in -old $referenceDump", CommandDeps: []string{"$sAbiDiffer"}, Description: "header-abi-diff -o ${out} -new $in -old $referenceDump", }, |