diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2018-06-11 20:16:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-11 20:16:21 +0000 |
| commit | 694b1c7c944f4cb20e059b8a00d0979baf193bbe (patch) | |
| tree | d43fc4525f3b5b454f8c0d66676b7e59af8736ef /cc | |
| parent | 30f9382654cb9481266bd6837c66d5f55fe11c3d (diff) | |
| parent | c7434e28d3d2eac379bde38856b8f15879ba107b (diff) | |
| download | build_soong-694b1c7c944f4cb20e059b8a00d0979baf193bbe.tar.gz build_soong-694b1c7c944f4cb20e059b8a00d0979baf193bbe.tar.bz2 build_soong-694b1c7c944f4cb20e059b8a00d0979baf193bbe.zip | |
Merge "For llndk libraries add -consider-opaque-types-different to header-abi-diff invocation."
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/builder.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cc/builder.go b/cc/builder.go index bc3652e9..51d3195c 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -726,11 +726,14 @@ func SourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD baseName, exportedHeaderFlags string, isVndkExt bool) android.OptionalPath { outputFile := android.PathForModuleOut(ctx, baseName+".abidiff") - + libName := strings.TrimSuffix(baseName, filepath.Ext(baseName)) localAbiCheckAllowFlags := append([]string(nil), abiCheckAllowFlags...) if exportedHeaderFlags == "" { localAbiCheckAllowFlags = append(localAbiCheckAllowFlags, "-advice-only") } + if inList(libName, llndkLibraries) { + localAbiCheckAllowFlags = append(localAbiCheckAllowFlags, "-consider-opaque-types-different") + } if isVndkExt { localAbiCheckAllowFlags = append(localAbiCheckAllowFlags, "-allow-extensions") } @@ -743,7 +746,7 @@ func SourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD Implicit: referenceDump, Args: map[string]string{ "referenceDump": referenceDump.String(), - "libName": baseName[0:(len(baseName) - len(filepath.Ext(baseName)))], + "libName": libName, "arch": ctx.Arch().ArchType.Name, "allowFlags": strings.Join(localAbiCheckAllowFlags, " "), }, |