ro.dalvik.vm.isa.arm=x86 \
ro.enable.native.bridge.exec=1 \
+ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.dalvik.vm.isa.arm64=x86_64 \
+ ro.enable.native.bridge.exec64=1
+endif
+
+ifneq ($(HOUDINI_PREINSTALL),intel)
PRODUCT_DEFAULT_PROPERTY_OVERRIDES := ro.dalvik.vm.native.bridge=libnb.so
PRODUCT_PACKAGES := libnb
+endif
$(call inherit-product-if-exists,vendor/intel/houdini/houdini.mk)