OSDN > 開発者 > n6457188 > 作業部屋 > device-generic-common > コミット

device-generic-common
Fork

コミット

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

Conflicts:
BoardConfig.mk
packages.mk

--- a/BoardConfig.mk

+++ b/BoardConfig.mk

		@@ -75,3 +75,7 @@ BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
75	75	endif
76	76
77	77	BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(PRODUCT_RELEASE_NAME)
	78	+
	79	+COMPATIBILITY_ENHANCEMENT_PACKAGE := true
	80	+PRC_COMPATIBILITY_PACKAGE := true
	81	+ZIP_OPTIMIZATION_NO_INTEGRITY := true

--- a/init.sh

+++ b/init.sh

		@@ -32,6 +32,10 @@ function init_hal_audio()
32	32	*)
33	33	;;
34	34	esac
	35	+
	36	+ if [ "`cat /proc/asound/card0/id`" = "IntelHDMI" ]; then
	37	+ [ -d /proc/asound/card1 ] \|\| set_property ro.hardware.audio.primary hdmi
	38	+ fi
35	39	}
36	40
37	41	function init_hal_bluetooth()

--- a/nativebridge/bin/enable_nativebridge

+++ b/nativebridge/bin/enable_nativebridge

		@@ -44,6 +44,7 @@ fi
44	44
45	45	cd $binfmt_misc_dir
46	46	if [ -e register ]; then
	47	+ [ -e /system/bin/houdini$1 ] && dest_dir=/system/bin
47	48	# register Houdini for arm binaries
48	49	if [ -z "$1" ]; then
49	50	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

--- a/nativebridge/nativebridge.mk

+++ b/nativebridge/nativebridge.mk

		@@ -29,8 +29,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
29	29	ro.enable.native.bridge.exec64=1
30	30	endif
31	31
	32	+ifneq ($(HOUDINI_PREINSTALL),intel)
32	33	PRODUCT_DEFAULT_PROPERTY_OVERRIDES := ro.dalvik.vm.native.bridge=libnb.so
33	34
34	35	PRODUCT_PACKAGES := libnb
	36	+endif
35	37
36	38	$(call inherit-product-if-exists,vendor/intel/houdini/houdini.mk)

--- a/packages.mk

+++ b/packages.mk