openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Ensure no redundant ABI reference dumps" 

am: 5358b924a3

Change-Id: I69955371ba2e6aa3ecbe73efdece3ebfd0845a27
This commit is contained in:
Hsin-Yi Chen 2019-07-23 20:02:11 -07:00 committed by android-build-merger
parent 547f9e3726 5358b924a3
commit 8421d77549
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ endif
droidcore: check-vndk-list droidcore: check-vndk-list
check-vndk-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-list-timestamp check-vndk-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-list-timestamp
check-vndk-abi-dump-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-abi-dump-list-timestamp
ifeq ($(TARGET_IS_64_BIT)|$(TARGET_2ND_ARCH),true|) ifeq ($(TARGET_IS_64_BIT)|$(TARGET_2ND_ARCH),true|)
# TODO(b/110429754) remove this condition when we support 64-bit-only device # TODO(b/110429754) remove this condition when we support 64-bit-only device
@ -50,6 +51,9 @@ else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)
check-vndk-list: ; check-vndk-list: ;
else else
check-vndk-list: $(check-vndk-list-timestamp) check-vndk-list: $(check-vndk-list-timestamp)
ifneq ($(SKIP_ABI_CHECKS),true)
check-vndk-list: $(check-vndk-abi-dump-list-timestamp)
endif
endif endif
_vndk_check_failure_message := " error: VNDK library list has been changed.\n" _vndk_check_failure_message := " error: VNDK library list has been changed.\n"
@ -97,6 +101,43 @@ else
endif endif
@chmod a+x $@ @chmod a+x $@
#####################################################################
# Check that all ABI reference dumps have corresponding NDK/VNDK
# libraries.
# $(1): The directory containing ABI dumps.
# Return a list of ABI dump paths ending with .so.lsdump.
define find-abi-dump-paths
$(if $(wildcard $(1)), \
$(addprefix $(1)/, \
$(call find-files-in-subdirs,$(1),"*.so.lsdump" -and -type f,.)))
endef
VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(PLATFORM_VNDK_VERSION)
NDK_ABI_DUMP_DIR := prebuilts/abi-dumps/ndk/$(PLATFORM_VNDK_VERSION)
VNDK_ABI_DUMPS := $(call find-abi-dump-paths,$(VNDK_ABI_DUMP_DIR))
NDK_ABI_DUMPS := $(call find-abi-dump-paths,$(NDK_ABI_DUMP_DIR))
$(check-vndk-abi-dump-list-timestamp): $(VNDK_ABI_DUMPS) $(NDK_ABI_DUMPS)
$(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \
$(addsuffix .so.lsdump,$(VNDK_SAMEPROCESS_LIBRARIES) $(VNDK_CORE_LIBRARIES)), \
$(notdir $(VNDK_ABI_DUMPS))))))
$(if $(added_vndk_abi_dumps), \
echo -e "Found ABI reference dumps for non-VNDK libraries. Run \`find \$${ANDROID_BUILD_TOP}/$(VNDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_vndk_abi_dumps)) ')' -delete\` to delete the dumps.")
$(eval added_ndk_abi_dumps := $(strip $(sort $(filter-out \
$(addsuffix .so.lsdump,$(NDK_MIGRATED_LIBS) $(LLNDK_LIBRARIES)), \
$(notdir $(NDK_ABI_DUMPS))))))
$(if $(added_ndk_abi_dumps), \
echo -e "Found ABI reference dumps for non-NDK libraries. Run \`find \$${ANDROID_BUILD_TOP}/$(NDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_ndk_abi_dumps)) ')' -delete\` to delete the dumps.")
$(if $(added_vndk_abi_dumps)$(added_ndk_abi_dumps),exit 1)
$(hide) mkdir -p $(dir $@)
$(hide) touch $@
#####################################################################
# VNDK package and snapshot.
ifneq ($(BOARD_VNDK_VERSION),) ifneq ($(BOARD_VNDK_VERSION),)
include $(CLEAR_VARS) include $(CLEAR_VARS)