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

Merge "Revert "Define a make target for all APEX dumps"" into main am: 65e34c1138

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3043894

Change-Id: I13118ca0a6fc132b8d4fc3c1f4d254a9bac57f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mina Granic
2024-04-16 10:45:15 +00:00
committed by Automerger Merge Worker
parent c9419d0b1c 65e34c1138
commit 25e9809460
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
target/product/gsi/Android.mk
View File

@@ -8,7 +8,7 @@ LOCAL_PATH:= $(call my-dir)
# Check if vndk list is changed # Check if vndk list is changed
droidcore: check-abi-dump-list droidcore: check-abi-dump-list
check-abi-dump-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-abi-dump-list-timestamp check-vndk-abi-dump-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-abi-dump-list-timestamp
ifneq ($(SKIP_ABI_CHECKS),true) ifneq ($(SKIP_ABI_CHECKS),true)
check-abi-dump-list: $(check-abi-dump-list-timestamp) check-abi-dump-list: $(check-abi-dump-list-timestamp)
@@ -34,9 +34,6 @@ $(patsubst $(tag_patterns),%,$(filter $(tag_patterns),$(2)))
endef endef
# Subsets of LSDUMP_PATHS. # Subsets of LSDUMP_PATHS.
.PHONY: findlsdumps_APEX
findlsdumps_APEX: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,APEX,$(LSDUMP_PATHS))
.PHONY: findlsdumps_LLNDK .PHONY: findlsdumps_LLNDK
findlsdumps_LLNDK: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,LLNDK,$(LSDUMP_PATHS)) findlsdumps_LLNDK: $(LSDUMP_PATHS_FILE) $(call filter-abi-dump-paths,LLNDK,$(LSDUMP_PATHS))
@@ -51,7 +48,7 @@ findlsdumps: $(LSDUMP_PATHS_FILE) $(foreach p,$(LSDUMP_PATHS),$(call word-colon,
##################################################################### #####################################################################
# Check that all ABI reference dumps have corresponding # Check that all ABI reference dumps have corresponding
# APEX/LLNDK/PLATFORM libraries. # NDK/VNDK/PLATFORM libraries.
# $(1): The directory containing ABI dumps. # $(1): The directory containing ABI dumps.
# Return a list of ABI dump paths ending with .so.lsdump. # Return a list of ABI dump paths ending with .so.lsdump.
@@ -63,12 +60,9 @@ endef
# $(1): A list of tags. # $(1): A list of tags.
# $(2): A list of tag:path. # $(2): A list of tag:path.
# Return the file names of the ABI dumps that match the tags, and replace the # Return the file names of the ABI dumps that match the tags.
# file name extensions with .so.lsdump.
define filter-abi-dump-names define filter-abi-dump-names
$(patsubst %.so.llndk.lsdump,%.so.lsdump, \ $(notdir $(call filter-abi-dump-paths,$(1),$(2)))
$(patsubst %.so.apex.lsdump,%.so.lsdump, \
$(notdir $(call filter-abi-dump-paths,$(1),$(2)))))
endef endef
VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(RELEASE_BOARD_API_LEVEL) VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(RELEASE_BOARD_API_LEVEL)
@@ -83,22 +77,21 @@ PLATFORM_ABI_DUMPS := $(call find-abi-dump-paths,$(PLATFORM_ABI_DUMP_DIR))
# Check for superfluous lsdump files. Since LSDUMP_PATHS only covers the # Check for superfluous lsdump files. Since LSDUMP_PATHS only covers the
# libraries that can be built from source in the current build, and prebuilts of # libraries that can be built from source in the current build, and prebuilts of
# Mainline modules may be in use, we also allow the libs in STUB_LIBRARIES for # Mainline modules may be in use, we also allow the libs in STUB_LIBRARIES for
# platform ABIs. # NDK and platform ABIs.
# In addition, libRS is allowed because it's disabled for RISC-V.
$(check-abi-dump-list-timestamp): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS) $(check-abi-dump-list-timestamp): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS)
$(check-abi-dump-list-timestamp): PRIVATE_STUB_LIBRARIES := $(STUB_LIBRARIES) $(check-abi-dump-list-timestamp): PRIVATE_STUB_LIBRARIES := $(STUB_LIBRARIES)
$(check-abi-dump-list-timestamp): $(check-abi-dump-list-timestamp):
$(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \ $(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \
$(call filter-abi-dump-names,LLNDK,$(PRIVATE_LSDUMP_PATHS)) libRS.so.lsdump, \ $(call filter-abi-dump-names,LLNDK,$(PRIVATE_LSDUMP_PATHS)), \
$(notdir $(VNDK_ABI_DUMPS)))))) $(notdir $(VNDK_ABI_DUMPS))))))
$(if $(added_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.") 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.")
# TODO(b/314010764): Remove LLNDK tag after PLATFORM_SDK_VERSION is upgraded to 35. # TODO(b/314010764): Remove LLNDK tag after PLATFORM_SDK_VERSION is upgraded to 35.
$(eval added_platform_abi_dumps := $(strip $(sort $(filter-out \ $(eval added_platform_abi_dumps := $(strip $(sort $(filter-out \
$(call filter-abi-dump-names,APEX LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \ $(call filter-abi-dump-names,LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \
$(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)) libRS.so.lsdump, \ $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \
$(notdir $(PLATFORM_ABI_DUMPS)))))) $(notdir $(PLATFORM_ABI_DUMPS))))))
$(if $(added_platform_abi_dumps), \ $(if $(added_platform_abi_dumps), \
echo -e "Found unexpected ABI reference dump files under $(PLATFORM_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(PLATFORM_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_platform_abi_dumps)) ')' -delete\` to delete the dump files.") echo -e "Found unexpected ABI reference dump files under $(PLATFORM_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(PLATFORM_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_platform_abi_dumps)) ')' -delete\` to delete the dump files.")