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 3af2dd3..2d99748 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -59,17 +59,14 @@ USE_INTEL_OMX_COMPONENTS := true
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
 BOARD_USES_DRM_HWCOMPOSER ?= true
+BOARD_EGL_WORKAROUND_BUG_10194508 := true
 
 USE_CAMERA_STUB ?= false
 
-SUPERUSER_EMBEDDED := true
-SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
-
 # This enables the wpa wireless driver
-BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB ?= private_lib_driver_cmd
-WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
-WIFI_DRIVER_MODULE_PATH ?= auto
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+WPA_SUPPLICANT_VERSION := VER_2_1_DEVEL
+WIFI_DRIVER_MODULE_NAME := brcmfmac
 
 BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast virgl vmwgfx
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
@@ -77,7 +74,7 @@ TARGET_HARDWARE_3D := true
 BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
 endif
 
-BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(TARGET_PRODUCT)
+BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(PRODUCT_RELEASE_NAME)
 
 COMPATIBILITY_ENHANCEMENT_PACKAGE := true
 PRC_COMPATIBILITY_PACKAGE := true

diff --git a/device.mk b/device.mk
index 2c17ac4..f81ebe4 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -30,11 +30,11 @@ PRODUCT_COPY_FILES := \
     $(if $(wildcard $(PRODUCT_DIR)init.rc),$(PRODUCT_DIR)init.rc:root/init.rc) \
     $(if $(wildcard $(PRODUCT_DIR)init.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.sh:system/etc/init.sh \
     $(if $(wildcard $(PRODUCT_DIR)modules.blacklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blacklist:system/etc/modules.blacklist \
-    $(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \
+    $(if $(wildcard $(PRODUCT_DIR)fstab.$(PRODUCT_RELEASE_NAME)),$(PRODUCT_DIR)fstab.$(PRODUCT_RELEASE_NAME),$(LOCAL_PATH)/fstab.x86):root/fstab.$(PRODUCT_RELEASE_NAME) \
     $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
     $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \
-    $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(TARGET_PRODUCT).rc \
-    $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(TARGET_PRODUCT).rc \
+    $(if $(wildcard $(PRODUCT_DIR)init.$(PRODUCT_RELEASE_NAME).rc),$(PRODUCT_DIR)init.$(PRODUCT_RELEASE_NAME).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(PRODUCT_RELEASE_NAME).rc \
+    $(if $(wildcard $(PRODUCT_DIR)ueventd.$(PRODUCT_RELEASE_NAME).rc),$(PRODUCT_DIR)ueventd.$(PRODUCT_RELEASE_NAME).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(PRODUCT_RELEASE_NAME).rc \
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/ppp/ip-up:system/etc/ppp/ip-up \
@@ -106,3 +106,6 @@ $(call inherit-product-if-exists,vendor/google/products/gms.mk)
 
 # Get native bridge settings
 $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)
+
+# Inherit some common CM stuff.
+$(call inherit-product, vendor/cm/config/common_full_phone.mk)

diff --git a/init.x86.rc b/init.x86.rc
index b79a42a..ce5bf24 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -36,6 +36,8 @@ on boot
     setprop status.battery.level 5
     setprop status.battery.level_raw  50
     setprop status.battery.level_scale 9
+    setprop wifi.interface "wlan0"
+    setprop wlan.driver.status "ok"
 
     # merge from system.prop
     setprop ro.config.sync yes

diff --git a/media_codecs.xml b/media_codecs.xml
index ba1fbdb..7aaa8e1 100644 (file)
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -80,4 +80,5 @@ Only the three quirks included above are recognized at this point:
 <MediaCodecs>
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_video.xml" />
+    <Include href="media_codecs_ffmpeg.xml" />
 </MediaCodecs>

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 18a06db..97274a8 100644 (file)
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -25,7 +25,7 @@ else
                else
                        url=http://goo.gl/n6KtQa
                fi
-               wget $url -cO houdini$1.sfs && continue
+               busybox wget $url -cO houdini$1.sfs && continue
                rm -f houdini$1.sfs
                sleep 30
        done

diff --git a/packages.mk b/packages.mk
index 0e1c611..f13b836 100644 (file)
--- a/packages.mk
+++ b/packages.mk
@@ -17,25 +17,10 @@
 # Common packages for Android-x86 platform.
 
 PRODUCT_PACKAGES := \
-    BasicSmsReceiver \
     Development \
-    Galaxy4 \
-    GlobalTime \
-    HoloSpiralWallpaper \
-    Launcher3 \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    MagicSmokeWallpapers \
-    NotePad \
-    PhaseBeam \
-    PinyinIME \
-    Provision \
     RSSReader \
-    VisualizationWallpapers \
     camera.x86 \
-    chat \
     com.android.future.usb.accessory \
-    drmserver \
     eject \
     gps.default \
     gps.huawei \
@@ -58,6 +43,8 @@ PRODUCT_PACKAGES := \
     tablet-mode \
     v86d \
     wacom-input \
+    Terminal \
+    busybox \
 
 PRODUCT_PACKAGES += \
     libwpa_client \
@@ -67,20 +54,16 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     badblocks \
-    e2fsck \
-    fsck.exfat \
     fsck.f2fs \
     mke2fs \
-    make_f2fs \
     mkfs.exfat \
+    mkfs.f2fs \
     mkntfs \
     mount.exfat \
     ntfs-3g \
     ntfsfix \
-    resize2fs \
     tune2fs \
 
 # Third party apps
 PRODUCT_PACKAGES += \
-    CMFileManager \
     Eleven \