Include VNDK snapshot for 32 bit binder
Use the VNDK sanpshot that matches the version of the target binder.
Bug: 74362637
Bug: 80450527
Test: m -j vndk_snapshot_package
Change-Id: I7d540654c9554f9d8a1feaec5eb441389d3960cb
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