From 74b32cbcbb7a8d4a7651c90df60d49c245f9303a Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Wed, 2 Dec 2015 23:55:00 +0800
Subject: [PATCH] Test build 20151202

---
 init.sh                              | 14 +++++++++++++-
 init.x86.rc                          |  7 +++----
 nativebridge/bin/enable_nativebridge |  4 ++--
 packages.mk                          |  4 ++--
 x86.mk                               |  6 +++---
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/init.sh b/init.sh
index 96cbaa3..2dbe15d 100644
--- a/init.sh
+++ b/init.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 The Android-x86 Open Source Project
+# Copyright (C) 2013-2015 The Android-x86 Open Source Project
 #
 # License: GNU Public License v2 or later
 #
@@ -12,6 +12,10 @@ function set_property()
 
 function init_misc()
 {
+	# device information
+	setprop ro.product.manufacturer "$(cat $DMIPATH/sys_vendor)"
+	setprop ro.product.model "$PRODUCT"
+
 	# a hack for USB modem
 	lsusb | grep 1a8d:1000 && eject
 
@@ -398,6 +402,14 @@ for c in `cat /proc/cmdline`; do
 			;;
 		*=*)
 			eval $c
+			case $c in
+				HWACCEL=*)
+					set_property debug.egl.hw $HWACCEL
+					;;
+				DEBUG=*)
+					set_property debug.logcat 1
+					;;
+			esac
 			;;
 	esac
 done
diff --git a/init.x86.rc b/init.x86.rc
index 467c3b8..6ed2264 100644
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -19,10 +19,6 @@ on init
     # Backward compatibility
     symlink system/lib /lib
 
-    # device information
-    setprop ro.product.manufacturer $[/sys/class/dmi/id/sys_vendor]
-    setprop ro.product.model $[/sys/class/dmi/id/product_name]
-
     exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
 
 on fs
@@ -143,3 +139,6 @@ on property:persist.sys.nativebridge=1
 
 on property:persist.sys.nativebridge=0
     stop nativebridge
+
+on property:debug.egl.hw=0
+    setprop ro.kernel.qemu 1
diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index ef00891..3de5cfb 100644
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -24,9 +24,9 @@ while [ ! -s $dest_dir/libhoudini.so ]; do
 		sleep 10
 	done
 	if [ -z "$1" ]; then
-		[ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Xl1str || url=http://goo.gl/PA2qZ7
+		[ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Knnmyl || url=http://goo.gl/JsoX2C
 	else
-		url=http://goo.gl/L00S7l
+		url=http://goo.gl/n6KtQa
 	fi
 	wget $url -cO houdini.tgz &&
 		bzcat houdini.tgz | tar xvf - -C $dest_dir && rm -f houdini.tgz && break
diff --git a/packages.mk b/packages.mk
index 56c5c67..88cf723 100644
--- a/packages.mk
+++ b/packages.mk
@@ -46,6 +46,7 @@ PRODUCT_PACKAGES := \
     libhuaweigeneric-ril \
     lights.default \
     make_ext4fs \
+    parted \
     powerbtnd \
     scp \
     sensors.hsb \
@@ -76,5 +77,4 @@ PRODUCT_PACKAGES += \
 
 # Third party apps
 PRODUCT_PACKAGES += \
-    Superuser \
-    TSCalibration2 \
+    CMFileManager \
diff --git a/x86.mk b/x86.mk
index a852186..2c94d1f 100644
--- a/x86.mk
+++ b/x86.mk
@@ -21,6 +21,9 @@
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.com.android.dateformat=MM-dd-yyyy \
 
+$(call inherit-product,$(LOCAL_PATH)/device.mk)
+$(call inherit-product,$(LOCAL_PATH)/packages.mk)
+
 # Get a list of languages.
 $(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
 
@@ -29,6 +32,3 @@ $(call inherit-product,$(SRC_TARGET_DIR)/product/generic.mk)
 
 # Get some sounds
 $(call inherit-product-if-exists,frameworks/base/data/sounds/AudioPackage6.mk)
-
-$(call inherit-product,$(LOCAL_PATH)/device.mk)
-$(call inherit-product,$(LOCAL_PATH)/packages.mk)
-- 
2.11.0