From f4b79c684a19912f34d6c0f0b7776e4bdedf4e13 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 2 Aug 2018 02:27:02 +0800 Subject: [PATCH] Check ABI stability of all NDK libs This commit extends ABI stability checks to all NDK shared libs (including the framework-related ones such as libandroid.so). Bug: 112404572 Bug: 79576032 Test: make findlsdumps # (and check the output) Change-Id: I0147c60ce0c90d187f85b996911d98326a0c37ae --- cc/cc.go | 3 +++ cc/library.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cc/cc.go b/cc/cc.go index 44d5900f9..2d967ed50 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -585,6 +585,9 @@ func (ctx *moduleContextImpl) shouldCreateVndkSourceAbiDump() bool { if inList(ctx.baseModuleName(), llndkLibraries) { return true } + if inList(ctx.baseModuleName(), ndkMigratedLibs) { + return true + } if ctx.useVndk() && ctx.isVndk() { // Return true if this is VNDK-core, VNDK-SP, or VNDK-Ext and this is not // VNDK-private. diff --git a/cc/library.go b/cc/library.go index 147dd8e05..7ff7885c1 100644 --- a/cc/library.go +++ b/cc/library.go @@ -604,7 +604,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, } func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path { - isLlndk := inList(ctx.baseModuleName(), llndkLibraries) + isLlndk := inList(ctx.baseModuleName(), llndkLibraries) || inList(ctx.baseModuleName(), ndkMigratedLibs) refAbiDumpTextFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isLlndk, false) refAbiDumpGzipFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isLlndk, true)