Merge remote-tracking branch 'x86/marshmallow-x86' into nougat-x86

[android-x86/device-generic-common.git] / nativebridge / nativebridge.mk

diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 8622ffe..c8641a2 100644 (file)
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -17,22 +17,22 @@ NATIVE_BRIDGE_ABI_LIST_64_BIT := arm64-v8a
 
 LOCAL_SRC_FILES := bin/enable_nativebridge
 
-ifneq ($(filter %x86_64/,$(PRODUCT_DIR)),)
-
-LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(shell find $(LOCAL_PATH)/lib64/arm64 -type f))
-
-endif
-
-LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(shell find $(LOCAL_PATH)/lib/arm -type f))
-
 PRODUCT_COPY_FILES := $(foreach f,$(LOCAL_SRC_FILES),$(LOCAL_PATH)/$(f):system/$(f))
 
 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)