summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2020-04-02 16:21:15 +0530
committerAmit Pundir <amit.pundir@linaro.org>2020-04-02 19:13:54 +0530
commit4fdd94b356938842ca103e9d9f31f7682cff024c (patch)
tree10620fa15cc054c922d0773c85715c01d32d7a46
parent03c85fe1ed44ecf80bcb979b5b8ac6fa2d5d5ddb (diff)
downloaddragonboard410c-4fdd94b356938842ca103e9d9f31f7682cff024c.tar.gz
db410c32_only: Enable Treble, first stage mount and other misc fixes
* Enable Treble * Enable first stage mount * Bump graphics, bt, wifi, audio service versions * Switch default kernel to v5.2 * Inherit Android Go defaults for 512M RAM devices Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Change-Id: Ic65957950a29fd275dd31ab1d1285618fc290c23
Diffstat
-rw-r--r--BoardConfigCommon.mk4
-rw-r--r--db410c32_only.mk3
-rw-r--r--db410c32_only/BoardConfig.mk4
-rw-r--r--db410c32_only/device.mk5
-rw-r--r--db410c32_only/fstab.ramdisk2
-rw-r--r--device-common.mk86
-rw-r--r--manifest.xml28
-rw-r--r--sepolicy/zygote.te2
-rw-r--r--ueventd.common.rc6
9 files changed, 83 insertions, 57 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index cb67c8c..b3ee03a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -37,6 +37,10 @@ BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE=ext4
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_FLASH_BLOCK_SIZE := 512
+# Enable Treble
+PRODUCT_FULL_TREBLE := true
+BOARD_VNDK_VERSION := current
+
# Mesa DRM hwcomposer
BOARD_USES_DRM_HWCOMPOSER := true
BOARD_GPU_DRIVERS := freedreno virgl
diff --git a/db410c32_only.mk b/db410c32_only.mk
index 162f53c..16b414a 100644
--- a/db410c32_only.mk
+++ b/db410c32_only.mk
@@ -1,6 +1,7 @@
-TARGET_PREBUILT_KERNEL ?= db410c-qcomlt-4.14.gz-dtb
+TARGET_PREBUILT_KERNEL ?= db410c-amt-5.2.gz-dtb
# Inherit the full_base and device configurations
+$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults_512.mk)
$(call inherit-product, device/linaro/dragonboard/db410c32_only/device.mk)
$(call inherit-product, device/linaro/dragonboard/device-common.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
diff --git a/db410c32_only/BoardConfig.mk b/db410c32_only/BoardConfig.mk
index 7873026..8976ff4 100644
--- a/db410c32_only/BoardConfig.mk
+++ b/db410c32_only/BoardConfig.mk
@@ -19,8 +19,8 @@ TARGET_BOARD_PLATFORM := db410c
# Image Configuration
BOARD_KERNEL_BASE := 0x80008000
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x0
-BOARD_KERNEL_CMDLINE := firmware_class.path=/system/vendor/firmware/ androidboot.hardware=db410c
-BOARD_KERNEL_CMDLINE += printk.devkmsg=on
+BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/system/vendor/firmware/ androidboot.hardware=db410c
+BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc/7824900.sdhci printk.devkmsg=on
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1288491008
BOARD_USERDATAIMAGE_PARTITION_SIZE := 5653544960
TARGET_COPY_OUT_VENDOR := vendor
diff --git a/db410c32_only/device.mk b/db410c32_only/device.mk
index c5685aa..69af0ee 100644
--- a/db410c32_only/device.mk
+++ b/db410c32_only/device.mk
@@ -15,11 +15,12 @@
#
PRODUCT_COPY_FILES := \
+ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.db410c \
+ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/etc/fstab.db410c \
device/linaro/dragonboard-kernel/$(TARGET_PREBUILT_KERNEL):kernel \
- device/linaro/dragonboard/fstab.common:root/fstab.db410c \
+ device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.db410c \
device/linaro/dragonboard/init.common.rc:root/init.db410c.rc \
device/linaro/dragonboard/init.common.usb.rc:root/init.db410c.usb.rc \
- device/linaro/dragonboard/ueventd.common.rc:root/ueventd.db410c.rc \
device/linaro/dragonboard/common.kl:system/usr/keylayout/db410c.kl
# Dalvik/ART Heap Configuration
diff --git a/db410c32_only/fstab.ramdisk b/db410c32_only/fstab.ramdisk
new file mode 100644
index 0000000..139fba6
--- /dev/null
+++ b/db410c32_only/fstab.ramdisk
@@ -0,0 +1,2 @@
+/dev/block/platform/soc/7824900.sdhci/by-name/system /system ext4 ro,errors=panic wait,first_stage_mount
+/dev/block/platform/soc/7824900.sdhci/by-name/cache /vendor ext4 ro,errors=panic wait,first_stage_mount
diff --git a/device-common.mk b/device-common.mk
index cff8af0..5ce9680 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -23,27 +23,45 @@ DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
# Build and run only ART
PRODUCT_RUNTIMES := runtime_libart_default
-# DRM
-PRODUCT_PACKAGES := \
+PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+
+# vndk
+PRODUCT_PACKAGES := vndk-sp
+
+# HACK: Avoid usb crash
+PRODUCT_PRODUCT_PROPERTIES := \
+ persist.adb.nonblocking_ffs=0 \
+ ro.adb.nonblocking_ffs=0
+
+# Display
+PRODUCT_PACKAGES += \
android.hardware.drm@1.0-impl \
android.hardware.drm@1.0-service \
android.hardware.graphics.allocator@2.0-impl \
android.hardware.graphics.allocator@2.0-service \
- android.hardware.graphics.composer@2.1-impl \
- android.hardware.graphics.composer@2.1-service \
- android.hardware.graphics.mapper@2.0-impl \
- android.hardware.graphics.mapper@2.0-service \
+ android.hardware.graphics.composer@2.2-impl \
+ android.hardware.graphics.composer@2.2-service \
+ android.hardware.graphics.mapper@2.0-impl-2.1 \
gralloc.gbm \
hwcomposer.drm \
libGLES_mesa
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.hardware.gralloc=gbm \
+ ro.hardware.hwcomposer=drm \
+ debug.sf.no_hw_vsync=1 \
+ hwc.drm.use_framebuffer_target=1 \
+ hwc.drm.use_overlay_planes=0 \
+ ro.sf.lcd_density=160 \
+ ro.opengles.version=196608 \
+ persist.demo.rotationlock=1
+
# Use Launcher3QuickStep
PRODUCT_PACKAGES += Launcher3QuickStep
# Enable WiFi
PRODUCT_PACKAGES += \
- android.hardware.wifi@1.0-service \
- android.hardware.wifi.supplicant@1.0 \
hostapd \
libwpa_client \
wpa_supplicant \
@@ -51,35 +69,36 @@ PRODUCT_PACKAGES += \
wificond \
wifilogd
-PRODUCT_PROPERTY_OVERRIDES := \
+PRODUCT_PROPERTY_OVERRIDES += \
wifi.interface=wlan0 \
wifi.supplicant_scan_interval=15
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
- frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
+ frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
+ frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
$(LOCAL_PATH)/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
$(LOCAL_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
# Enable BT
PRODUCT_PACKAGES += \
- android.hardware.bluetooth@1.0-service.btlinux
+ android.hardware.bluetooth@1.1-service.btlinux
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
- frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
+ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
+ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
# Audio
PRODUCT_PACKAGES += \
- android.hardware.audio@2.0-impl \
+ android.hardware.audio@4.0-impl:32 \
+ android.hardware.audio.effect@4.0-impl:32 \
android.hardware.audio@2.0-service \
- android.hardware.audio.effect@2.0-impl \
- android.hardware.broadcastradio@1.0-impl \
- android.hardware.soundtrigger@2.0-impl
+ android.hardware.soundtrigger@2.0-impl \
+ android.hardware.bluetooth.audio@2.0-impl
# Build default bluetooth a2dp and usb audio HALs
PRODUCT_PACKAGES += \
audio.a2dp.default \
+ audio.bluetooth.default \
audio.usb.default \
audio.r_submix.default
@@ -94,7 +113,10 @@ PRODUCT_PACKAGES += \
USE_XML_AUDIO_POLICY_CONF := 1
PRODUCT_COPY_FILES += \
device/linaro/hikey/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ device/linaro/hikey/audio/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
@@ -102,9 +124,9 @@ PRODUCT_COPY_FILES += \
# Copy media codecs config file
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
- frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
- frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml
+ $(LOCAL_PATH)/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml
# PowerHAL
PRODUCT_PACKAGES += android.hardware.power@1.0-impl
@@ -113,11 +135,12 @@ PRODUCT_PACKAGES += android.hardware.power@1.0-impl
PRODUCT_PACKAGES += android.hardware.gnss@1.0-impl
# Memtrack
-PRODUCT_PACKAGES += memtrack.default \
+PRODUCT_PACKAGES += \
+ memtrack.default \
android.hardware.memtrack@1.0-service \
android.hardware.memtrack@1.0-impl
-# Keymaster HAL
+# Keymaster
PRODUCT_PACKAGES += \
android.hardware.keymaster@3.0-impl \
android.hardware.keymaster@3.0-service
@@ -133,14 +156,15 @@ PRODUCT_PACKAGES += \
# Copy standard platform config files
PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
device/linaro/hikey/etc/permissions/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \
- frameworks/native/data/etc/android.software.cts.xml:system/etc/permissions/android.software.cts.xml \
- frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \
- frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \
- frameworks/native/data/etc/android.software.voice_recognizers.xml:system/etc/permissions/android.software.voice_recognizers.xml \
- frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
- frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
- frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
- frameworks/native/data/etc/android.software.device_admin.xml:system/etc/permissions/android.software.device_admin.xml
+ frameworks/native/data/etc/android.software.cts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.cts.xml \
+ frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
+ frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \
+ frameworks/native/data/etc/android.software.voice_recognizers.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.voice_recognizers.xml \
+ frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
+ frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
+ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
+ frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml
PRODUCT_SOONG_NAMESPACES += external/mesa3d
diff --git a/manifest.xml b/manifest.xml
index 485013c..fd574ea 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,8 +1,8 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="2">
<hal format="hidl">
<name>android.hardware.bluetooth</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.1</version>
<interface>
<name>IBluetoothHci</name>
<instance>default</instance>
@@ -20,7 +20,7 @@
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>
- <version>2.1</version>
+ <version>2.2</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
@@ -29,7 +29,7 @@
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
- <version>2.0</version>
+ <version>2.1</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
@@ -51,7 +51,7 @@
<hal format="hidl">
<name>android.hardware.configstore</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.1</version>
<interface>
<name>ISurfaceFlingerConfigs</name>
<instance>default</instance>
@@ -69,7 +69,7 @@
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
- <version>2.0</version>
+ <version>4.0</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
@@ -78,7 +78,7 @@
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
- <version>2.0</version>
+ <version>4.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
@@ -116,19 +116,9 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.wifi</name>
- <transport>hwbinder</transport>
- <impl level="generic"></impl>
- <version>1.0</version>
- <interface>
- <name>IWifi</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.wifi.supplicant</name>
<transport>hwbinder</transport>
- <version>1.1</version>
+ <version>1.2</version>
<interface>
<name>ISupplicant</name>
<instance>default</instance>
@@ -137,7 +127,7 @@
<hal format="hidl">
<name>android.hardware.wifi.hostapd</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.1</version>
<interface>
<name>IHostapd</name>
<instance>default</instance>
diff --git a/sepolicy/zygote.te b/sepolicy/zygote.te
deleted file mode 100644
index b6b1702..0000000
--- a/sepolicy/zygote.te
+++ /dev/null
@@ -1,2 +0,0 @@
-#============= zygote ==============
-allow zygote vendor_file:file read;
diff --git a/ueventd.common.rc b/ueventd.common.rc
index f9d72db..89721eb 100644
--- a/ueventd.common.rc
+++ b/ueventd.common.rc
@@ -18,3 +18,9 @@
/dev/sw_sync 0660 root graphics
/dev/iio:device0 0660 system system
+# gpu
+/dev/dri/card0 0660 system graphics
+/dev/dri/renderD128 0666 system graphics
+
+# media.codec2
+/dev/ion 0664 system system
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 01:48:21 +0000