Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
	BoardConfig.mk
	packages.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index dbf2777..2d99748 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -75,3 +75,7 @@ BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
 endif
 
 BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(PRODUCT_RELEASE_NAME)
+
+COMPATIBILITY_ENHANCEMENT_PACKAGE := true
+PRC_COMPATIBILITY_PACKAGE := true
+ZIP_OPTIMIZATION_NO_INTEGRITY := true

diff --git a/init.sh b/init.sh
index caec377..e9bbb98 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -32,6 +32,10 @@ function init_hal_audio()
                *)
                        ;;
        esac
+
+       if [ "`cat /proc/asound/card0/id`" = "IntelHDMI" ]; then
+               [ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
+       fi
 }
 
 function init_hal_bluetooth()

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 63b0c28..97274a8 100644 (file)
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -44,6 +44,7 @@ fi
 
 cd $binfmt_misc_dir
 if [ -e register ]; then
+       [ -e /system/bin/houdini$1 ] && dest_dir=/system/bin
        # register Houdini for arm binaries
        if [ -z "$1" ]; then
                echo ':arm_exe:M::\\x7f\\x45\\x4c\\x46\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28::'"$dest_dir/houdini:P" > register

diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 09edeab..c8641a2 100644 (file)
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -29,8 +29,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     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)

diff --git a/packages.mk b/packages.mk
index e145ee2..f13b836 100644 (file)
--- a/packages.mk
+++ b/packages.mk
@@ -54,8 +54,10 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     badblocks \
+    fsck.f2fs \
     mke2fs \
     mkfs.exfat \
+    mkfs.f2fs \
     mkntfs \
     mount.exfat \
     ntfs-3g \