aosp_beryllium: Update device config
Bring aosp_beryllium device config up to speed with post
Android-10 AOSP master changes. This device config is
relatively close to upstream AOSP/device/linaro/dragonboard
project now.
Signed-off-by: Amit Pundir <pundiramit@gmail.com>
diff --git a/device-common.mk b/device-common.mk
index 4f86c3a..b8e1d23 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -20,10 +20,8 @@
# Build and run only ART
PRODUCT_RUNTIMES := runtime_libart_default
-PRODUCT_SHIPPING_API_LEVEL := 25
-
-# Enable Treble
-PRODUCT_FULL_TREBLE_OVERRIDE := true
+PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
# vndk
PRODUCT_PACKAGES := vndk-sp
@@ -33,27 +31,32 @@
persist.adb.nonblocking_ffs=0 \
ro.adb.nonblocking_ffs=0
-# DRM
+# 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.opengles.version=196609
+
# 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 \
@@ -61,15 +64,15 @@
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:$(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
+ $(LOCAL_PATH)/etc/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
+ $(LOCAL_PATH)/etc/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
# Enable BT
PRODUCT_PACKAGES += \
@@ -84,7 +87,6 @@
android.hardware.audio@4.0-impl:32 \
android.hardware.audio.effect@4.0-impl:32 \
android.hardware.audio@2.0-service \
- android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.0-impl
# Build default bluetooth a2dp and usb audio HALs
@@ -103,8 +105,11 @@
# audio policy configuration
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 \
+ $(LOCAL_PATH)/etc/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ $(LOCAL_PATH)/etc/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 \
@@ -112,9 +117,9 @@
# 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)/etc/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
# Memtrack
PRODUCT_PACKAGES += \
@@ -131,9 +136,18 @@
PRODUCT_PACKAGES += \
android.hardware.gatekeeper@1.0-service.software
+# Health
+PRODUCT_PACKAGES += \
+ android.hardware.health@2.0-service \
+ android.hardware.health@2.0-impl
+
+# mkbootimg host tool to build boot.img separately
+PRODUCT_HOST_PACKAGES := \
+ mkbootimg
+
# Copy standard platform config files
PRODUCT_COPY_FILES += \
- device/linaro/hikey/etc/permissions/android.hardware.screen.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.screen.xml \
+ $(LOCAL_PATH)/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
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 \