Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9cdbe12
Sync with android-x86-4.4-r2 release
cwhuang Jan 8, 2015
3b1393c
Add fstab to fix annoying 'RLIMIT_NICE not set' errors
cwhuang Jan 9, 2015
a3a5b70
bluetooth: disable rfkill for usb bluetooth
Jan 18, 2015
725c1b9
init.sh: add support of iio sensors
cwhuang Jun 6, 2015
3fdee8f
Properly define TARGET_USES_64_BIT_BINDER
cwhuang Jul 26, 2015
81475bc
Enable native bridge
cwhuang Sep 30, 2015
39745eb
Allow to control native bridge via a property
cwhuang Oct 1, 2015
7c69285
Allow to add extra apps
cwhuang Oct 5, 2015
87491eb
android-x86 5.1-rc1 release (20151007)
cwhuang Oct 6, 2015
d730b5c
Fix the building issues on Android 6.0
cwhuang Oct 10, 2015
4c27a85
Build v86d from source
cwhuang Oct 20, 2015
989d000
init.x86.rc: use the marshmallow built-in command exec
cwhuang Nov 20, 2015
3319a7c
Update external storage configuration
cwhuang Nov 26, 2015
122e4dd
init.sh: unmute audio of Broadwell-Y-based tablets
f3flight Nov 24, 2015
74b32cb
Test build 20151202
cwhuang Dec 2, 2015
4b2f7da
init.sh: enable egl trace on error in debug mode
maurossi Dec 24, 2015
da13abb
init.sh: avoid rild crashing
cwhuang Feb 1, 2016
63f8732
Add support for GSL1680 I2C touchscreen on ST70416-6
holzingerm Feb 3, 2016
23c6a4f
Support virgl GPU
cwhuang Feb 16, 2016
40e0fb3
Use btattach for BT bcm UART devices
meijjaa Feb 22, 2016
257ca71
init.x86.rc: remove duplicate commands
cwhuang Mar 9, 2016
994f665
Change the default firmware dir
cwhuang May 5, 2016
c6f84ee
init.sh: enable llvmpipe software rendering
cwhuang May 5, 2016
cb96e98
Enable the support of radeonsi and vmwgfx GPUs
cwhuang May 5, 2016
1ecb56d
init.sh: fix the old software renderer
cwhuang May 6, 2016
da8e5d9
idc: add more files
cwhuang May 9, 2016
9425a96
init.sh: only do set_property on the init stage
cwhuang May 9, 2016
6ecde99
nativebridge: move 64-bit properties to its own configurations
cwhuang May 13, 2016
a678bc1
nativebridge: remove cpuinfo
cwhuang May 13, 2016
6d541ff
Change btattach to be a standard android service
cwhuang May 14, 2016
445d851
nativebridge: download and mount sfs
cwhuang May 17, 2016
d6c400a
include libtxc_dxn to support S3TC texture compression for mesa
jide-wuzhen Feb 19, 2016
012d9f4
avoid dalvik-cache for system binaries
codcop May 20, 2016
9ae68f1
init.sh: don't try to load the dummy camera driver
cwhuang Jun 3, 2016
610e31f
init.sh: fix the Cube i7 Stylus tablet sensor orientation
cwhuang Jun 3, 2016
ed41a20
init.sh: disable hwcomposer of the virgl gpu
cwhuang Jun 3, 2016
a977f8e
init: move the init.sh execution to the post-fs stage
cwhuang Jun 3, 2016
7c1821b
Fix some Mac WiFi drivers conflict
Jun 3, 2016
296dccf
Add the Power HAL for x86
cwhuang Jun 5, 2016
71ba16b
init.sh: support the accelerometer of HP laptops
SuicSoft Jun 7, 2016
897bf66
Android-x86 6.0-rc1 release (20160608)
cwhuang Jun 7, 2016
8e5e264
init.sh: set sensor hal to hdaps if lis3lv02d_i2c is loaded
cwhuang Jun 22, 2016
00379b2
Change ro.rtc_local_time to persist.rtc_local_time
codcop Jun 12, 2016
ce990c3
packages.mk: add fsck.exfat and mkfs.exfat
cwhuang Jul 6, 2016
7585436
init.sh: honor sensors.${ro_hardware}.so first
cwhuang Jul 9, 2016
a5d3564
Create an x86_64.mk as a base of all 64-bit targets
cwhuang Jul 14, 2016
787f578
init.sh: change uvesafb default mode to 1024x768
cwhuang Jul 14, 2016
6651049
nativebridge: support different installations
cwhuang Jul 14, 2016
eca345a
init.sh: skip useless cmdline
cwhuang Jul 21, 2016
bc5a2da
init: Only tell Android we have a ril when we have one
meijjaa Jul 28, 2016
52e240e
init: Add dhcpcd services for bt-pan to enable BT tethering
meijjaa Jul 28, 2016
cc1a672
init: Fix sensors never detected when not available at first boot
meijjaa Jul 28, 2016
783b774
Revert "init: Fix sensors never detected when not available at first …
cwhuang Jul 29, 2016
48acfb4
init.x86.rc: move symlink of /lib to init.rc
cwhuang Jul 29, 2016
7fbe9f5
init.sh: support IntelHDMI audio HAL
cwhuang Aug 8, 2016
0e9d6b5
Android-x86 6.0-rc2 release (20160815)
cwhuang Aug 15, 2016
baf6eb9
houdini: support Intel's implementation
cwhuang Jul 15, 2016
39b8d80
Fix building errors of nougat-x86
cwhuang Aug 3, 2016
9c64ea7
Enable SELinux permissive mode
cwhuang Aug 25, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ TARGET_BOARD_PLATFORM := android-x86

# Some framework code requires this to enable BT
BOARD_HAVE_BLUETOOTH := 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
Expand All @@ -21,14 +18,18 @@ BOARD_MALLOC_ALIGNMENT := 16
# 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_PIC := true
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 := $(if $(filter x86_64,$(TARGET_ARCH) $(TARGET_KERNEL_ARCH)),true)

BOARD_USES_GENERIC_AUDIO ?= false
BOARD_USES_ALSA_AUDIO ?= true
Expand All @@ -47,6 +48,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
Expand All @@ -55,6 +58,7 @@ USE_INTEL_OMX_COMPONENTS := true

USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
BOARD_USES_DRM_HWCOMPOSER ?= true

USE_CAMERA_STUB ?= false

Expand All @@ -67,11 +71,15 @@ 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 ilo r300g r600g nouveau vmwgfx
BOARD_GPU_DRIVERS ?= i915 i965 swrast r300g r600g
BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast 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.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive
TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig

COMPATIBILITY_ENHANCEMENT_PACKAGE := true
PRC_COMPATIBILITY_PACKAGE := true
ZIP_OPTIMIZATION_NO_INTEGRITY := true
36 changes: 36 additions & 0 deletions app/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#
# Copyright (C) 2011-2015 The Android-x86 Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#

LOCAL_PATH := $(call my-dir)
LOCAL_APPS := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*$(COMMON_ANDROID_PACKAGE_SUFFIX)))

define include-app
include $$(CLEAR_VARS)

LOCAL_LIBS := $$(shell zipinfo -1 $$(LOCAL_PATH)/$(1) | grep ^lib/ | grep -v /$$$$)

LOCAL_MODULE := $$(basename $(1))
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $$(suffix $(1))
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_CERTIFICATE := PRESIGNED
LOCAL_SRC_FILES := $(1)
LOCAL_DEX_PREOPT := false
LOCAL_MODULE_TARGET_ARCH := $$(call get-prebuilt-src-arch,$$(notdir $$(patsubst %/,%,$$(dir $$(LOCAL_LIBS)))))
LOCAL_PREBUILT_JNI_LIBS := $$(addprefix @,$$(filter lib/$$(LOCAL_MODULE_TARGET_ARCH)/%,$$(LOCAL_LIBS)))
#$$(info $$(LOCAL_MODULE) LOCAL_MODULE_TARGET_ARCH=$$(LOCAL_MODULE_TARGET_ARCH))
#$$(info $$(LOCAL_MODULE) LOCAL_PREBUILT_JNI_LIBS=$$(LOCAL_PREBUILT_JNI_LIBS))
include $$(BUILD_PREBUILT)

ALL_DEFAULT_INSTALLED_MODULES += $$(LOCAL_INSTALLED_MODULE)
endef

$(foreach a,$(LOCAL_APPS),$(eval $(call include-app,$(a))))
Binary file added app/AndroidTerm.apk
Binary file not shown.
3 changes: 3 additions & 0 deletions app/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
# Put your apks here. The Android-x86 build system will add them automatically.
#
19 changes: 11 additions & 8 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ PRODUCT_PROPERTY_OVERRIDES := \

PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \
ro.arch=x86 \
ro.rtc_local_time=1 \
persist.rtc_local_time=1 \

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)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 \
Expand All @@ -42,6 +43,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/media_codecs.xml:system/etc/media_codecs.xml \
$(LOCAL_PATH)/media_profiles.xml:system/etc/media_profiles.xml \
device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
Expand All @@ -53,11 +55,12 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
frameworks/native/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
Expand All @@ -78,7 +81,7 @@ PRODUCT_AAPT_PREF_CONFIG := mdpi
DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay

# Get the firmwares
$(call inherit-product,$(LOCAL_PATH)/firmware.mk)
$(call inherit-product,device/generic/firmware/firmware.mk)

# Get the touchscreen calibration tool
$(call inherit-product-if-exists,external/tslib/tslib.mk)
Expand All @@ -101,5 +104,5 @@ $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-hea
# Get GMS
$(call inherit-product-if-exists,vendor/google/products/gms.mk)

# Get Arm translator
$(call inherit-product-if-exists,vendor/intel/houdini/houdini.mk)
# Get native bridge settings
$(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)
15 changes: 0 additions & 15 deletions firmware.mk

This file was deleted.

5 changes: 5 additions & 0 deletions fstab.x86
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
none /cache tmpfs nosuid,nodev,noatime defaults

/devices/*/usb*/* auto auto defaults voldmanaged=usb:auto,encryptable=userdata
/devices/*/*sdmmc*/* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
/devices/*/80860F14:01/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
3 changes: 2 additions & 1 deletion gpu/gpu_mesa.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

PRODUCT_PACKAGES := \
gralloc.drm \
libGLES_mesa
libGLES_mesa \
libtxc_dxtn \

PRODUCT_PROPERTY_OVERRIDES := \
ro.opengles.version = 196608
3 changes: 3 additions & 0 deletions idc/AlpsPS_2_ALPS_DualPoint_TouchPad.idc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
touch.deviceType = default
touch.orientationAware = 1
touch.gestureMode = spots
3 changes: 3 additions & 0 deletions idc/AlpsPS_2_ALPS_GlidePoint.idc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
touch.deviceType = default
touch.orientationAware = 1
touch.gestureMode = spots
3 changes: 3 additions & 0 deletions idc/Microsoft_Surface_Type_Cover_UNKNOWN.idc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
touch.deviceType = default
touch.orientationAware = 1
touch.gestureMode = spots
3 changes: 3 additions & 0 deletions idc/N-Trig_MultiTouch.idc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
touch.deviceType = touchScreen
touch.orientationAware = 0
device.internal = 1
Loading