# Native Bridge ABI List
NATIVE_BRIDGE_ABI_LIST_32_BIT := armeabi-v7a armeabi
-NATIVE_BRIDGE_ABI_LIST_64_BIT := arm64-v8a
LOCAL_SRC_FILES := bin/enable_nativebridge
-PRODUCT_COPY_FILES := $(foreach f,$(LOCAL_SRC_FILES),$(LOCAL_PATH)/$(f):system/$(f))
+PRODUCT_COPY_FILES := $(foreach f,$(LOCAL_SRC_FILES),$(LOCAL_PATH)/$(f):system/$(f)) \
+ $(LOCAL_PATH)/OEMBlackList:$(TARGET_COPY_OUT_VENDOR)/etc/misc/.OEMBlackList \
+ $(LOCAL_PATH)/OEMWhiteList:$(TARGET_COPY_OUT_VENDOR)/etc/misc/.OEMWhiteList \
+ $(LOCAL_PATH)/ThirdPartySO:$(TARGET_COPY_OUT_VENDOR)/etc/misc/.ThirdPartySO \
PRODUCT_PROPERTY_OVERRIDES := \
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)