StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "check-flagged-apis.sh: use correct path to generated API signature files" into main

Browse Source
This commit is contained in:
Mårten Kongstad
2024-05-03 06:53:52 +00:00
committed by Gerrit Code Review
parent ab47e15dd1 b9ce4c92e0
commit a57d0ef0a1
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/check-flagged-apis/check-flagged-apis.sh
View File

@@ -34,12 +34,21 @@ function build() {
frameworks-base-api-module-lib-current.txt frameworks-base-api-module-lib-current.txt
} }
function aninja() {
local T="$(gettop)"
(\cd "${T}" && prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-${TARGET_PRODUCT}.ninja "$@")
}
function path_to_api_signature_file {
aninja -t query device_"$1"_all_targets | grep -A1 -e input: | tail -n1
}
function run() { function run() {
local errors=0 local errors=0
echo "# current" echo "# current"
check-flagged-apis \ check-flagged-apis \
--api-signature $(gettop)/out/target/product/mainline_x86/obj/ETC/frameworks-base-api-current.txt_intermediates/frameworks-base-api-current.txt \ --api-signature $(path_to_api_signature_file "frameworks-base-api-current.txt") \
--flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \ --flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \
--api-versions $(gettop)/out/dist/data/api-versions.xml --api-versions $(gettop)/out/dist/data/api-versions.xml
(( errors += $? )) (( errors += $? ))
@@ -47,7 +56,7 @@ function run() {
echo echo
echo "# system-current" echo "# system-current"
check-flagged-apis \ check-flagged-apis \
--api-signature $(gettop)/out/target/product/mainline_x86/obj/ETC/frameworks-base-api-system-current.txt_intermediates/frameworks-base-api-system-current.txt \ --api-signature $(path_to_api_signature_file "frameworks-base-api-system-current.txt") \
--flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \ --flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \
--api-versions $(gettop)/out/dist/system-data/api-versions.xml --api-versions $(gettop)/out/dist/system-data/api-versions.xml
(( errors += $? )) (( errors += $? ))
@@ -55,7 +64,7 @@ function run() {
echo echo
echo "# system-server-current" echo "# system-server-current"
check-flagged-apis \ check-flagged-apis \
--api-signature $(gettop)/out/target/product/mainline_x86/obj/ETC/frameworks-base-api-system-server-current.txt_intermediates/frameworks-base-api-system-server-current.txt \ --api-signature $(path_to_api_signature_file "frameworks-base-api-system-server-current.txt") \
--flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \ --flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \
--api-versions $(gettop)/out/dist/system-server-data/api-versions.xml --api-versions $(gettop)/out/dist/system-server-data/api-versions.xml
(( errors += $? )) (( errors += $? ))
@@ -63,7 +72,7 @@ function run() {
echo echo
echo "# module-lib" echo "# module-lib"
check-flagged-apis \ check-flagged-apis \
--api-signature $(gettop)/out/target/product/mainline_x86/obj/ETC/frameworks-base-api-module-lib-current.txt_intermediates/frameworks-base-api-module-lib-current.txt \ --api-signature $(path_to_api_signature_file "frameworks-base-api-module-lib-current.txt") \
--flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \ --flag-values $(gettop)/out/soong/.intermediates/all_aconfig_declarations.pb \
--api-versions $(gettop)/out/dist/module-lib-data/api-versions.xml --api-versions $(gettop)/out/dist/module-lib-data/api-versions.xml
(( errors += $? )) (( errors += $? ))