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

[android-x86/device-generic-common.git] / BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 55d4d12..e7b87a2 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -6,13 +6,12 @@ TARGET_BOARD_PLATFORM := android-x86
 
 # Some framework code requires this to enable BT
 BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_LINUX := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
-BLUETOOTH_HCI_USE_USB := true
-BOARD_HAVE_BLUETOOTH_BCM := true
 
 BOARD_USE_LEGACY_UI := true
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1073741824)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1610612736)
 
 # customize the malloced address to be 16-byte aligned
 BOARD_MALLOC_ALIGNMENT := 16
@@ -20,15 +19,19 @@ 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
-TARGET_GCC_VERSION_EXP := 4.9
+WITH_DEXPREOPT := false
+WITH_DEXPREOPT_PIC := false
 endif
 
 # the following variables could be overridden
 TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 TARGET_NO_RECOVERY ?= true
-TARGET_EXTRA_KERNEL_MODULES := 8723au tp_smapi
+TARGET_EXTRA_KERNEL_MODULES := tp_smapi
+ifneq ($(filter efi_img,$(MAKECMDGOALS)),)
+TARGET_KERNEL_ARCH ?= x86_64
+endif
+TARGET_USES_64_BIT_BINDER := true
 
 BOARD_USES_GENERIC_AUDIO ?= false
 BOARD_USES_ALSA_AUDIO ?= true
@@ -47,6 +50,8 @@ BUILD_EMULATOR_GPS_MODULE ?= false
 BUILD_EMULATOR_LIGHTS_MODULE ?= false
 BUILD_EMULATOR_SENSORS_MODULE ?= false
 
+BUILD_ARM_FOR_X86 := $(WITH_NATIVE_BRIDGE)
+
 BOARD_USE_LIBVA_INTEL_DRIVER := true
 BOARD_USE_LIBVA := true
 BOARD_USE_LIBMIX := true
@@ -55,20 +60,31 @@ 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
 
 # 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 ilo r300g r600g nouveau vmwgfx
-BOARD_GPU_DRIVERS ?= i915 i965 swrast r300g r600g
+BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 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) video=-16
+BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive $(if $(filter true,$(TARGET_USES_64_BIT_BINDER)),,vmalloc=192M)
+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-r2
+RELEASE_OS_TITLE := LineageOS
+BUILD_NAME_VARIANT := cm-x86
+INSTALL_PREFIX := cm-x86-$(VER)
+PREV_VERS := cm-x86-13.0-rc1 cm-x86-13.0-r1 cm-x86-14.1-rc1 cm-x86-14.1-r1