OSDN Git Service
(root)
/
android-x86
/
device-generic-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
[android-x86/device-generic-common.git]
/
BoardConfig.mk
diff --git
a/BoardConfig.mk
b/BoardConfig.mk
index
faf780c
..
7ab0e17
100644
(file)
--- a/
BoardConfig.mk
+++ b/
BoardConfig.mk
@@
-7,13
+7,11
@@
TARGET_BOARD_PLATFORM := android-x86
# Some framework code requires this to enable BT
BOARD_HAVE_BLUETOOTH := true
BOARD_HAVE_BLUETOOTH_LINUX := true
# 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
BOARD_USE_LEGACY_UI := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
-BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR := gzip
-#TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1610612736)
# customize the malloced address to be 16-byte aligned
BOARD_MALLOC_ALIGNMENT := 16
# customize the malloced address to be 16-byte aligned
BOARD_MALLOC_ALIGNMENT := 16
@@
-33,7
+31,7
@@
TARGET_EXTRA_KERNEL_MODULES := tp_smapi
ifneq ($(filter efi_img,$(MAKECMDGOALS)),)
TARGET_KERNEL_ARCH ?= x86_64
endif
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
BOARD_USES_GENERIC_AUDIO ?= false
BOARD_USES_ALSA_AUDIO ?= true
@@
-62,6
+60,7
@@
USE_INTEL_OMX_COMPONENTS := true
USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
+BOARD_USES_DRM_GRALLOC := true
BOARD_USES_DRM_HWCOMPOSER ?= true
SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
BOARD_USES_DRM_HWCOMPOSER ?= true
SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
@@
-79,7
+78,7
@@
ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
TARGET_HARDWARE_3D := true
endif
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
TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig
COMPATIBILITY_ENHANCEMENT_PACKAGE := true
@@
-87,3
+86,8
@@
PRC_COMPATIBILITY_PACKAGE := true
ZIP_OPTIMIZATION_NO_INTEGRITY := true
DEVICE_MANIFEST_FILE := device/generic/common/manifest.xml
ZIP_OPTIMIZATION_NO_INTEGRITY := true
DEVICE_MANIFEST_FILE := device/generic/common/manifest.xml
+
+BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy/nonplat \
+ system/bt/vendor_libs/linux/sepolicy \
+
+BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/generic/common/sepolicy/plat_private