Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4acf2f75 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Automerger Merge Worker
Browse files

Merge "Define a make target for all LLNDK dumps" into main am: bc5a4271 

Original change: https://android-review.googlesource.com/c/platform/build/+/2968542



Change-Id: I67bd741967cfab8d2114b81a7e7aa05a231c2015
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 200c9588 bc5a4271

core/main.mk

+0 −11
Original line number Diff line number Diff line
@@ -1996,17 +1996,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:

target/product/gsi/Android.mk

+43 −7
Original line number Diff line number Diff line
@@ -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



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), \