From b930d1d397e54cffe3dd90e4b680bfddbc226ab7 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 22 Jun 2018 12:18:28 +0900 Subject: [PATCH] Don't check the vndk lib list for 64-bit only product vndk-check-list check can't be done for 64-bit only product. Some VNDK libraries (libstagefright_codec_*) are 32-bit only and thus not built for 64-bit only product. As a result vndk-check-list always fails on such device. Suppressing the error until the codec libraries are built with 64-bit. Bug: 110429754 Test: m -j on hikey64_only Change-Id: I240ceee3fd0a778e47904ed44a1964084f354141 --- target/product/vndk/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/product/vndk/Android.mk b/target/product/vndk/Android.mk index 3e9d8fa0a5..5d009f94cb 100644 --- a/target/product/vndk/Android.mk +++ b/target/product/vndk/Android.mk @@ -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))