Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4f7afb2..977b292 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,8 +19,8 @@ BOARD_MALLOC_ALIGNMENT := 16
 # Enable dex-preoptimization to speed up the first boot sequence
 # of an SDK AVD. Note that this operation only works on Linux for now
 ifeq ($(HOST_OS),linux)
-WITH_DEXPREOPT := true
-WITH_DEXPREOPT_PIC := true
+WITH_DEXPREOPT := false
+WITH_DEXPREOPT_PIC := false
 endif
 
 # the following variables could be overridden
@@ -62,17 +62,14 @@ USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
 BOARD_USES_DRM_GRALLOC := true
 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 virgl vmwgfx
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
@@ -85,3 +82,9 @@ TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig
 COMPATIBILITY_ENHANCEMENT_PACKAGE := true
 PRC_COMPATIBILITY_PACKAGE := true
 ZIP_OPTIMIZATION_NO_INTEGRITY := true
+
+# LineageOS specific
+VER := 14.1-r4
+RELEASE_OS_TITLE := LineageOS
+BUILD_NAME_VARIANT := cm-x86
+INSTALL_PREFIX := cm-x86-$(VER)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index ca4f50f..89bf057 100644 (file)
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -1 +1,3 @@
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*)
 $(call add-clean-step, rm -rf $(TARGET_OUT_APPS)/AndroidTerm)

diff --git a/device.mk b/device.mk
index 41f818a..3fb3bd6 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -80,6 +80,12 @@ PRODUCT_TAGS += dalvik.gc.type-precise
 
 PRODUCT_CHARACTERISTICS := tablet
 
+WITH_SU := true
+
+# Boot animation
+TARGET_SCREEN_WIDTH := 1024
+TARGET_SCREEN_HEIGHT := 768
+
 PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := mdpi
 
@@ -114,3 +120,6 @@ $(call inherit-product-if-exists,$(if $(wildcard vendor/google/products/gms.mk),
 $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)
 
 $(call inherit-product,$(if $(wildcard $(PRODUCT_DIR)packages.mk),$(PRODUCT_DIR),$(LOCAL_PATH)/)packages.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 03727f3..2815562 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/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 1b893ee..01c41d2 100644 (file)
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -34,7 +34,7 @@ else
                while [ "$(getprop net.dns1)" = "" ]; do
                        sleep 10
                done
-               wget $url -cO houdini$v.sfs && continue
+               busybox wget $url -cO houdini$v.sfs && continue
                rm -f houdini$v.sfs
                sleep 30
        done

diff --git a/packages.mk b/packages.mk
index 6bae5ef..9524616 100644 (file)
--- a/packages.mk
+++ b/packages.mk
@@ -17,28 +17,11 @@
 # Common packages for Android-x86 platform.
 
 PRODUCT_PACKAGES := \
-    AnalyticsService \
-    BasicSmsReceiver \
     Development \
-    Galaxy4 \
-    GlobalTime \
-    HoloSpiralWallpaper \
-    Launcher3 \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    MagicSmokeWallpapers \
-    NotePad \
-    PhaseBeam \
-    PinyinIME \
-    Provision \
     RSSReader \
     Taskbar \
-    VisualizationWallpapers \
-    WallpaperPicker \
     camera.x86 \
-    chat \
     com.android.future.usb.accessory \
-    drmserver \
     eject \
     gps.default \
     gps.huawei \
@@ -60,6 +43,8 @@ PRODUCT_PACKAGES := \
     tablet-mode \
     v86d \
     wacom-input \
+    Terminal \
+    busybox \
 
 PRODUCT_PACKAGES += \
     libwpa_client \
@@ -69,17 +54,14 @@ 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 \
 
 PRODUCT_PACKAGES += \