From f46bc5add9c8cefbd11d9edf445d86e231a4ea49 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Mon, 15 Apr 2024 15:17:19 +0800 Subject: [PATCH] Define a make target for all APEX dumps The SDK finalization process will create APEX ABI dumps from this target. Test: make findlsdumps_APEX Bug: 333532038 Change-Id: Iaec03bd39923678141b12436e5a6b8576e63a999 --- target/product/gsi/Android.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index fc6cc68439..432fcd7038 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -34,6 +34,9 @@ $(patsubst $(tag_patterns),%,$(filter $(tag_patterns),$(2))) endef # Subsets of LSDUMP_PATHS. +.PHONY: findlsdumps_APEX +findlsdumps_APEX: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,APEX,$(LSDUMP_PATHS)) + .PHONY: findlsdumps_LLNDK findlsdumps_LLNDK: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,LLNDK,$(LSDUMP_PATHS)) @@ -48,7 +51,7 @@ findlsdumps: $(LSDUMP_PATHS_FILE) $(foreach p,$(LSDUMP_PATHS),$(call word-colon, ##################################################################### # Check that all ABI reference dumps have corresponding -# NDK/VNDK/PLATFORM libraries. +# APEX/LLNDK/PLATFORM libraries. # $(1): The directory containing ABI dumps. # Return a list of ABI dump paths ending with .so.lsdump. @@ -90,7 +93,7 @@ $(check-abi-dump-list-timestamp): # 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-names,LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \ + $(call filter-abi-dump-names,APEX LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \ $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \ $(notdir $(PLATFORM_ABI_DUMPS)))))) $(if $(added_platform_abi_dumps), \