Merge "Don't check the vndk lib list for 64-bit only product"

am: e2bc1154bf

Change-Id: Icf3457d7321d18ebb8f194895cae1a2443409ece
This commit is contained in:
Jiyong Park 2018-06-22 00:57:45 -07:00 committed by android-build-merger
commit b50ab74ea2
1 changed files with 6 additions and 0 deletions

View File

@ -38,7 +38,13 @@ endif
droidcore: check-vndk-list
check-vndk-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-list-timestamp
ifeq ($(TARGET_IS_64_BIT)|$(TARGET_2ND_ARCH),true|)
# TODO(b/110429754) remove this condition when we support 64-bit-only device
check-vndk-list: ;
else
check-vndk-list: $(check-vndk-list-timestamp)
endif
_vndk_check_failure_message := " error: VNDK library list has been changed.\n"
ifeq (REL,$(PLATFORM_VERSION_CODENAME))