From 1d6f8ddf3ea8489707f58e4b8ca4cd890b153815 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Mon, 6 May 2019 09:34:41 -0700 Subject: [PATCH] def-tool: Add APEX bionic to minimal tag file This commit add APEX bionic library paths to `minimal_tag_file.csv` and `eligible-list-28.csv`. This should fix a false positive warning regarding to non-VNDK-SP dependencies. Note: `eligible-list-28.csv` is updated as well because it is possible to have LLNDK 29 + VNDK 28. Bug: 126126189 Test: ./vndk_definition_tool.py deps-insight \ --system ${ANDROID_PRODUCT_OUT}/system \ --vendor ${ANDROID_PRODUCT_OUT}/vendor Change-Id: Ieb2841a79dbe466eca846d59549e9fc7b651aa03 --- vndk/tools/definition-tool/datasets/eligible-list-28.csv | 3 +++ vndk/tools/definition-tool/datasets/minimum_tag_file.csv | 3 +++ 2 files changed, 6 insertions(+) diff --git a/vndk/tools/definition-tool/datasets/eligible-list-28.csv b/vndk/tools/definition-tool/datasets/eligible-list-28.csv index efea8e58a..76f50aa9e 100644 --- a/vndk/tools/definition-tool/datasets/eligible-list-28.csv +++ b/vndk/tools/definition-tool/datasets/eligible-list-28.csv @@ -1,4 +1,7 @@ Path,Tag,Comments +/apex/com.android.runtime/${LIB}/bionic/libc.so,LL-NDK, +/apex/com.android.runtime/${LIB}/bionic/libdl.so,LL-NDK, +/apex/com.android.runtime/${LIB}/bionic/libm.so,LL-NDK, /system/${LIB}/android.frameworks.displayservice@1.0.so,VNDK, /system/${LIB}/android.frameworks.schedulerservice@1.0.so,VNDK, /system/${LIB}/android.frameworks.sensorservice@1.0.so,VNDK, diff --git a/vndk/tools/definition-tool/datasets/minimum_tag_file.csv b/vndk/tools/definition-tool/datasets/minimum_tag_file.csv index a892fe03c..f6b79a8b9 100644 --- a/vndk/tools/definition-tool/datasets/minimum_tag_file.csv +++ b/vndk/tools/definition-tool/datasets/minimum_tag_file.csv @@ -1,4 +1,7 @@ Path,Tag,Comments +/apex/com.android.runtime/${LIB}/bionic/libc.so,LL-NDK, +/apex/com.android.runtime/${LIB}/bionic/libdl.so,LL-NDK, +/apex/com.android.runtime/${LIB}/bionic/libm.so,LL-NDK, /system/${LIB}/libEGL.so,LL-NDK, /system/${LIB}/libGLESv1_CM.so,LL-NDK, /system/${LIB}/libGLESv2.so,LL-NDK,