diff options
| author | Logan Chien <loganchien@google.com> | 2019-04-29 17:40:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-29 17:40:06 +0000 |
| commit | 23803f936554103047bafe5ff5d4999e49aa940e (patch) | |
| tree | 8007f43ec7d608e3af38d52485b185efa4e0af4e /android | |
| parent | 77b47fdf511c9fb3d619789e9f3e72f9a762e96d (diff) | |
| parent | 41eabe63e892a59575180e95b2fc14b514bc58ec (diff) | |
| download | soong-23803f936554103047bafe5ff5d4999e49aa940e.tar.gz | |
Merge "Support opt-in ABI checks"
Diffstat (limited to 'android')
| -rw-r--r-- | android/paths.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/android/paths.go b/android/paths.go index 0f20b844d..da387a8a7 100644 --- a/android/paths.go +++ b/android/paths.go @@ -967,7 +967,7 @@ func pathForModule(ctx ModuleContext) OutputPath { // PathForVndkRefAbiDump returns an OptionalPath representing the path of the // reference abi dump for the given module. This is not guaranteed to be valid. func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, - isLlndk, isGzip bool) OptionalPath { + isLlndkOrNdk, isVndk, isGzip bool) OptionalPath { arches := ctx.DeviceConfig().Arches() if len(arches) == 0 { @@ -980,10 +980,12 @@ func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, } var dirName string - if isLlndk { + if isLlndkOrNdk { dirName = "ndk" - } else { + } else if isVndk { dirName = "vndk" + } else { + dirName = "platform" // opt-in libs } binderBitness := ctx.DeviceConfig().BinderBitness() |