From 23d855680c5eebc2dcd2a462016c824c8cc370b4 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Wed, 7 Feb 2024 21:38:45 +0800 Subject: [PATCH] Define a make target for all LLNDK dumps - Define findlsdumps_LLNDK that vFRC process will build. - Move LSDUMP_PATHS_FILE to target/product/gsi/Android.mk. - Allow LLNDK dumps in prebuilts/abi-dumps/vndk. Test: m findlsdumps_LLNDK check-vndk-list Bug: 314010764 Change-Id: I6329cd4b1b919069291a13bd03720ceea46b95ff --- core/main.mk | 11 -------- target/product/gsi/Android.mk | 50 ++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/core/main.mk b/core/main.mk index 9b98efeb14..ab59b4d438 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1994,17 +1994,6 @@ tests : host-tests target-tests .PHONY: findbugs findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET) -LSDUMP_PATHS_FILE := $(PRODUCT_OUT)/lsdump_paths.txt - -.PHONY: findlsdumps -# LSDUMP_PATHS is a list of tag:path. -findlsdumps: $(LSDUMP_PATHS_FILE) $(foreach p,$(LSDUMP_PATHS),$(call word-colon,2,$(p))) - -$(LSDUMP_PATHS_FILE): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS) -$(LSDUMP_PATHS_FILE): - @echo "Generate $@" - @rm -rf $@ && echo -e "$(subst :,:$(space),$(subst $(space),\n,$(PRIVATE_LSDUMP_PATHS)))" > $@ - .PHONY: check-elf-files check-elf-files: diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 54c84ea1c0..f348fbb60b 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -108,6 +108,38 @@ endif endif @chmod a+x $@ +##################################################################### +# ABI reference dumps. + +# LSDUMP_PATHS is a list of tag:path. They are written to LSDUMP_PATHS_FILE. +LSDUMP_PATHS_FILE := $(PRODUCT_OUT)/lsdump_paths.txt + +$(LSDUMP_PATHS_FILE): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS) +$(LSDUMP_PATHS_FILE): + @echo "Generate $@" + @rm -rf $@ && echo -e "$(subst :,:$(space),$(subst $(space),\n,$(PRIVATE_LSDUMP_PATHS)))" > $@ + +# $(1): A list of tags. +# $(2): A list of tag:path. +# Return the file paths of the ABI dumps that match the tags. +define filter-abi-dump-paths +$(eval tag_patterns := $(addsuffix :%,$(1))) +$(patsubst $(tag_patterns),%,$(filter $(tag_patterns),$(2))) +endef + +# Subsets of LSDUMP_PATHS. +.PHONY: findlsdumps_LLNDK +findlsdumps_LLNDK: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,LLNDK,$(LSDUMP_PATHS)) + +.PHONY: findlsdumps_NDK +findlsdumps_NDK: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,NDK,$(LSDUMP_PATHS)) + +.PHONY: findlsdumps_PLATFORM +findlsdumps_PLATFORM: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,PLATFORM,$(LSDUMP_PATHS)) + +.PHONY: findlsdumps +findlsdumps: $(LSDUMP_PATHS_FILE) $(foreach p,$(LSDUMP_PATHS),$(call word-colon,2,$(p))) + ##################################################################### # Check that all ABI reference dumps have corresponding # NDK/VNDK/PLATFORM libraries. @@ -123,12 +155,15 @@ endef # $(1): A list of tags. # $(2): A list of tag:path. # Return the file names of the ABI dumps that match the tags. -define filter-abi-dump-paths -$(eval tag_patterns := $(foreach tag,$(1),$(tag):%)) -$(notdir $(patsubst $(tag_patterns),%,$(filter $(tag_patterns),$(2)))) +define filter-abi-dump-names +$(notdir $(call filter-abi-dump-paths,$(1),$(2))) endef -VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(PLATFORM_VNDK_VERSION) +ifdef RELEASE_BOARD_API_LEVEL + VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(RELEASE_BOARD_API_LEVEL) +else + VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(PLATFORM_VNDK_VERSION) +endif ifeq (REL,$(PLATFORM_VERSION_CODENAME)) NDK_ABI_DUMP_DIR := prebuilts/abi-dumps/ndk/$(PLATFORM_SDK_VERSION) PLATFORM_ABI_DUMP_DIR := prebuilts/abi-dumps/platform/$(PLATFORM_SDK_VERSION) @@ -149,20 +184,21 @@ $(check-vndk-abi-dump-list-timestamp): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS) $(check-vndk-abi-dump-list-timestamp): PRIVATE_STUB_LIBRARIES := $(STUB_LIBRARIES) $(check-vndk-abi-dump-list-timestamp): $(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \ - $(call filter-abi-dump-paths,VNDK-SP VNDK-core,$(PRIVATE_LSDUMP_PATHS)), \ + $(call filter-abi-dump-names,LLNDK VNDK-SP VNDK-core,$(PRIVATE_LSDUMP_PATHS)), \ $(notdir $(VNDK_ABI_DUMPS)))))) $(if $(added_vndk_abi_dumps), \ echo -e "Found unexpected ABI reference dump files under $(VNDK_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(VNDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_vndk_abi_dumps)) ')' -delete\` to delete the dump files.") $(eval added_ndk_abi_dumps := $(strip $(sort $(filter-out \ - $(call filter-abi-dump-paths,NDK,$(PRIVATE_LSDUMP_PATHS)) \ + $(call filter-abi-dump-names,NDK,$(PRIVATE_LSDUMP_PATHS)) \ $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \ $(notdir $(NDK_ABI_DUMPS)))))) $(if $(added_ndk_abi_dumps), \ echo -e "Found unexpected ABI reference dump files under $(NDK_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(NDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_ndk_abi_dumps)) ')' -delete\` to delete the dump files.") + # TODO(b/314010764): Remove LLNDK tag after PLATFORM_SDK_VERSION is upgraded to 35. $(eval added_platform_abi_dumps := $(strip $(sort $(filter-out \ - $(call filter-abi-dump-paths,LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \ + $(call filter-abi-dump-names,LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \ $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \ $(notdir $(PLATFORM_ABI_DUMPS)))))) $(if $(added_platform_abi_dumps), \