OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 6 Sep 2018 06:56:02 +0000 (14:56 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 6 Sep 2018 06:56:02 +0000 (14:56 +0800)
1  2 
BoardConfig.mk
init.sh

diff --combined BoardConfig.mk
@@@ -7,6 -7,7 +7,7 @@@ TARGET_BOARD_PLATFORM := android-x8
  # 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
  
  BOARD_USE_LEGACY_UI := true
  
@@@ -30,7 -31,7 +31,7 @@@ TARGET_EXTRA_KERNEL_MODULES := tp_smap
  ifneq ($(filter efi_img,$(MAKECMDGOALS)),)
  TARGET_KERNEL_ARCH ?= x86_64
  endif
 -TARGET_USES_64_BIT_BINDER := $(if $(filter x86_64,$(TARGET_ARCH) $(TARGET_KERNEL_ARCH)),true)
 +TARGET_USES_64_BIT_BINDER := true
  
  BOARD_USES_GENERIC_AUDIO ?= false
  BOARD_USES_ALSA_AUDIO ?= true
@@@ -60,7 -61,6 +61,7 @@@ USE_INTEL_OMX_COMPONENTS := tru
  USE_OPENGL_RENDERER := true
  NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
  BOARD_USES_DRM_HWCOMPOSER ?= true
 +SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
  
  USE_CAMERA_STUB ?= false
  
@@@ -69,21 -69,18 +70,21 @@@ SUPERUSER_PACKAGE_PREFIX := com.android
  
  # 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_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
  ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
  TARGET_HARDWARE_3D := true
  endif
  
 -BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive $(if $(filter true,$(TARGET_USES_64_BIT_BINDER)),,vmalloc=192M)
 +BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive $(if $(filter x86_64,$(TARGET_ARCH) $(TARGET_KERNEL_ARCH)),,vmalloc=192M)
  TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig
  
  COMPATIBILITY_ENHANCEMENT_PACKAGE := true
  PRC_COMPATIBILITY_PACKAGE := true
  ZIP_OPTIMIZATION_NO_INTEGRITY := true
 +
 +DEVICE_MANIFEST_FILE := device/generic/common/manifest.xml
 +
 +BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy \
 +                       system/bt/vendor_libs/linux/sepolicy \
diff --combined init.sh
+++ b/init.sh
@@@ -55,6 -55,9 +55,9 @@@ function init_hal_bluetooth(
        done
  
        case "$PRODUCT" in
+               T100TAF)
+                       set_property bluetooth.interface hci1
+                       ;;
                T10*TA|M80TA|HP*Omni*)
                        BTUART_PORT=/dev/ttyS1
                        set_property hal.bluetooth.uart.proto bcm
@@@ -267,7 -270,7 +270,7 @@@ function init_hal_sensors(
                *ST70416-6*)
                        set_property ro.iio.accel.order 102
                        ;;
-               *T10*TA*|*pnEZpad*)
+               *T*0*TA*|*pnEZpad*)
                        set_property ro.iio.accel.y.opt_scale -1
                        ;;
                *)
@@@ -417,9 -420,6 +420,9 @@@ function do_bootcomplete(
                        setkeycodes 0x66 172
                        setkeycodes 0x6b 127
                        ;;
 +              VMware*)
 +                      pm disable com.android.bluetooth
 +                      ;;
                *)
                        ;;
        esac