commit 92222c3a62fcee67213f0a87493986edcdfc8dbd
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 11 19:37:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 11 19:37:59 2018 +0000
tree 1ec3bc40ec876f2982788b68051c5a5220f2473e
parent e59bb32cb7f7f2eab6628b34ba71d583baa0ec3e
parent b9dc23a4d8b0df48d0a94522e9d72e5a5509a890

Merge changes from topic "update_errorprone_2.3.1"

* changes:
  Tools: Update warn.py for Errorprone 2.3.1
  Tools: Sort Errorprone warn.py entries by name

target/product/vndk/Android.mk

diff --git a/target/product/vndk/Android.mk b/target/product/vndk/Android.mk
index 768cb80..b9ae116 100644
--- a/target/product/vndk/Android.mk
+++ b/target/product/vndk/Android.mk
@@ -98,8 +98,15 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := vndk_snapshot_package
+_binder32 :=
+ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+ifneq ($(TARGET_IS_64_BIT),true)
+_binder32 := _binder32
+endif
+endif
 LOCAL_REQUIRED_MODULES := \
-    $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH))
+    $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))
+_binder32 :=
 include $(BUILD_PHONY_PACKAGE)
 
 endif # BOARD_VNDK_VERSION is set