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

am: b50ab74ea2

Change-Id: I16734cd2c1b98cc81fbc859cb6138d00a8e44b3a
This commit is contained in:
Jiyong Park
2018-06-22 01:05:01 -07:00
committed by android-build-merger

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