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

Commit 1a902337 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Mina Granic
Browse files

Revert "Define a make target for all APEX dumps" 

This reverts commit ea9f51d6.

Reason for revert: aosp_cf_arm64_only_phone_hwasan-trunk_staging-userdebug fails

Fixes: 335131824
Bug: 333532038
Change-Id: I4d4bd31ebd8af18bcc44eb9ee45c167cbde026b0
parent ea9f51d6

target/product/gsi/Android.mk

+8 −15
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_PATH:= $(call my-dir) 
# Check if vndk list is changed

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)

check-abi-dump-list: $(check-abi-dump-list-timestamp)
@@ -34,9 +34,6 @@ $(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))
@@ -51,7 +48,7 @@ findlsdumps: $(LSDUMP_PATHS_FILE) $(foreach p,$(LSDUMP_PATHS),$(call word-colon, 


#####################################################################

# Check that all ABI reference dumps have corresponding

# APEX/LLNDK/PLATFORM libraries.

# NDK/VNDK/PLATFORM libraries.



# $(1): The directory containing ABI dumps.

# Return a list of ABI dump paths ending with .so.lsdump.
@@ -63,12 +60,9 @@ endef 


# $(1): A list of tags.

# $(2): A list of tag:path.

# Return the file names of the ABI dumps that match the tags, and replace the

# file name extensions with .so.lsdump.

# Return the file names of the ABI dumps that match the tags.

define filter-abi-dump-names

$(patsubst %.so.llndk.lsdump,%.so.lsdump, \

  $(patsubst %.so.apex.lsdump,%.so.lsdump, \

    $(notdir $(call filter-abi-dump-paths,$(1),$(2)))))

$(notdir $(call filter-abi-dump-paths,$(1),$(2)))

endef



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

# 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

# platform ABIs.

# In addition, libRS is allowed because it's disabled for RISC-V.

# NDK and platform ABIs.



$(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):

	$(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))))))

	$(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.")



	# 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,APEX LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \

	  $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)) libRS.so.lsdump, \

	  $(call filter-abi-dump-names,LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \

	  $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \

	  $(notdir $(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.")