commit e82b12cb09cc57898851ded5d82e514c0b7913bb
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 22 17:10:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 22 17:10:36 2018 +0000
tree 2c2538a5068a23e325291d997011b3b4e365178c
parent e2bc1154bf9b63b2da4b99c3fe3551b69472abde
parent 5f76fc0d7cadacf9124ed3fb56c6dac1010367ca

Merge "Mark implicit rules as obsolete"

target/product/vndk/Android.mk

diff --git a/target/product/vndk/Android.mk b/target/product/vndk/Android.mk
index 3e9d8fa..5d009f9 100644
--- a/target/product/vndk/Android.mk
+++ b/target/product/vndk/Android.mk
@@ -38,7 +38,13 @@
 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))