summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xAndroidBoard.mk6
-rwxr-xr-xBoardConfig.mk16
-rwxr-xr-xinit.target.rc6
-rwxr-xr-xsdm660_64.mk75
-rw-r--r--vintf.xml129
5 files changed, 219 insertions, 13 deletions
diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 3885d33..96cfa55 100755
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -19,7 +19,11 @@ endif
# Compile Linux Kernel
#----------------------------------------------------------------------
ifeq ($(KERNEL_DEFCONFIG),)
- KERNEL_DEFCONFIG := sdm660_defconfig
+ ifeq ($(TARGET_BUILD_VARIANT),user)
+ KERNEL_DEFCONFIG := sdm660-perf_defconfig
+ else
+ KERNEL_DEFCONFIG := sdm660_defconfig
+ endif
endif
ifeq ($(TARGET_KERNEL_SOURCE),)
diff --git a/BoardConfig.mk b/BoardConfig.mk
index bb7e049..dc3f9da 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,6 +31,7 @@ endif
TARGET_NO_BOOTLOADER := false
TARGET_USES_UEFI := true
TARGET_NO_KERNEL := false
+
-include $(QCPATH)/common/sdm660_64/BoardConfigVendor.mk
MINIMAL_FONT_FOOTPRINT := true
@@ -54,6 +55,11 @@ AB_OTA_PARTITIONS ?= boot system
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
TARGET_NO_RECOVERY := true
BOARD_USES_RECOVERY_AS_BOOT := true
+ifeq ($(ENABLE_VENDOR_IMAGE), true)
+TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery_vendor_variant.fstab
+else
+TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery.fstab
+endif
ifneq ($(AB_OTA_UPDATER),true)
TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm
@@ -65,6 +71,13 @@ BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64)
+ifeq ($(ENABLE_VENDOR_IMAGE), true)
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_COPY_OUT_VENDOR := vendor
+VENDOR_FSTAB_ENTRY := "/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,verify"
+endif
+
# Enable suspend during charger mode
BOARD_CHARGER_ENABLE_SUSPEND := true
@@ -154,3 +167,6 @@ TARGET_USES_IMS := true
#Add NON-HLOS files for ota upgrade
ADD_RADIO_FILES := true
+TARGET_RECOVERY_UI_LIB := librecovery_ui_msm
+
+
diff --git a/init.target.rc b/init.target.rc
index f33e1f0..fd780bd 100755
--- a/init.target.rc
+++ b/init.target.rc
@@ -108,6 +108,10 @@ on boot
chown system system /persist/speccfg/submask
chown system system /persist/speccfg/partition
+#Load WLAN driver
+ insmod /system/lib/modules/qca_cld3/qca_cld3_wlan.ko
+ setprop wlan.driver.status "ok"
+
#Peripheral manager
service per_mgr /system/bin/pm-service
class core
@@ -194,7 +198,7 @@ service time_daemon /system/bin/time_daemon
user root
group root
-service adsprpcd /system/bin/adsprpcd
+service adsprpcd /system/bin/adsprpcd audiopd
class main
user media
group media
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 30134f2..ddca3a7 100755
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -1,8 +1,10 @@
TARGET_USES_AOSP := true
+TARGET_USES_AOSP_FOR_AUDIO := true
TARGET_USES_QCOM_BSP := false
ifeq ($(TARGET_USES_AOSP),true)
TARGET_ENABLE_QC_AV_ENHANCEMENTS := false
+ TARGET_DISABLE_DASH := true
TARGET_USES_QTIC := false
else
DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
@@ -10,6 +12,17 @@ else
TARGET_USES_QTIC := true
endif
+# Default vendor configuration.
+ifeq ($(ENABLE_VENDOR_IMAGE),)
+ENABLE_VENDOR_IMAGE := false
+endif
+
+# Disable QTIC until it's brought up in split system/vendor
+# configuration to avoid compilation breakage.
+ifeq ($(ENABLE_VENDOR_IMAGE), true)
+TARGET_USES_QTIC := false
+endif
+
TARGET_KERNEL_VERSION := 4.4
BOARD_FRP_PARTITION_NAME := frp
BOARD_HAVE_QCOM_FM := false
@@ -20,6 +33,9 @@ ifeq ($(TARGET_USES_NQ_NFC),true)
NQ3XX_PRESENT := true
endif
+# enable the SVA in UI area
+TARGET_USE_UI_SVA := true
+
#QTIC flag
-include $(QCPATH)/common/config/qtic-config.mk
@@ -34,6 +50,15 @@ PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:system/vendor/et
device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \
device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml
+ifneq ($(TARGET_DISABLE_DASH), true)
+ PRODUCT_BOOT_JARS += qcmediaplayer
+endif
+
+# Power
+PRODUCT_PACKAGES += \
+ android.hardware.power@1.0-service \
+ android.hardware.power@1.0-impl
+
$(call inherit-product, device/qcom/common/common64.mk)
PRODUCT_NAME := sdm660_64
@@ -82,6 +107,8 @@ PRODUCT_COPY_FILES += \
# Audio configuration file
-include $(TOPDIR)hardware/qcom/audio/configs/sdm660/sdm660.mk
+PRODUCT_PACKAGES += android.hardware.media.omx@1.0-impl
+
# Sensor HAL conf file
PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/sensors/hals.conf:system/etc/sensors/hals.conf
@@ -107,16 +134,25 @@ PRODUCT_PACKAGES += \
antradio_app \
libvolumelistener
-# Gralloc
+#Display/Graphics
PRODUCT_PACKAGES += \
android.hardware.graphics.allocator@2.0-impl \
android.hardware.graphics.allocator@2.0-service \
- android.hardware.graphics.mapper@2.0-impl
-
-# HW Composer
-PRODUCT_PACKAGES += \
+ android.hardware.graphics.mapper@2.0-impl \
android.hardware.graphics.composer@2.1-impl \
- android.hardware.graphics.composer@2.1-service
+ android.hardware.graphics.composer@2.1-service \
+ android.hardware.memtrack@1.0-impl \
+ android.hardware.memtrack@1.0-service \
+ android.hardware.light@2.0-impl \
+ android.hardware.light@2.0-service \
+ android.hardware.configstore@1.0-service
+
+# Camera configuration file. Shared by passthrough/binderized camera HAL
+PRODUCT_PACKAGES += camera.device@3.2-impl
+PRODUCT_PACKAGES += camera.device@1.0-impl
+PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-impl
+# Enable binderized camera HAL
+PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-service
# Sensor features
PRODUCT_COPY_FILES += \
@@ -132,6 +168,10 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:system/etc/permissions/android.hardware.sensor.relative_humidity.xml \
frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:system/etc/permissions/android.hardware.sensor.hifi_sensors.xml
+# High performance VR feature
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.vr.high_performance.xml:system/etc/permissions/android.hardware.vr.high_performance.xml
+
# FBE support
PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/init.qti.qseecomd.sh:system/bin/init.qti.qseecomd.sh
@@ -142,6 +182,9 @@ PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:system/vendor/et
# dm-verity configuration
PRODUCT_SUPPORTS_VERITY := true
PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system
+ifeq ($(ENABLE_VENDOR_IMAGE), true)
+PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor
+endif
#for android_filesystem_config.h
PRODUCT_PACKAGES += \
@@ -166,15 +209,33 @@ else
ro.logdumpd.enabled=0
endif
+#for wlan
+PRODUCT_PACKAGES += \
+ wificond \
+ wifilogd
+
#A/B related packages
PRODUCT_PACKAGES += update_engine \
update_engine_client \
update_verifier \
bootctrl.sdm660 \
- brillo_update_payload
+ brillo_update_payload \
+ android.hardware.boot@1.0-impl \
+ android.hardware.boot@1.0-service
+
#Boot control HAL test app
PRODUCT_PACKAGES_DEBUG += bootctl
+#Healthd packages
+PRODUCT_PACKAGES += android.hardware.health@1.0-impl \
+ android.hardware.health@1.0-convert \
+ android.hardware.health@1.0-service \
+ libhealthd.msm
+
#FEATURE_OPENGLES_EXTENSION_PACK support string config file
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:system/etc/permissions/android.hardware.opengles.aep.xml
+
+#Enable keymaster Impl HAL Compilation
+PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl
+
diff --git a/vintf.xml b/vintf.xml
index 1c6f18b..de73ad3 100644
--- a/vintf.xml
+++ b/vintf.xml
@@ -26,23 +26,144 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<manifest version="1.0">
- <!-- /graphics hal -->
+ <hal format="hidl">
+ <name>android.hardware.audio</name>
+ <transport arch="32+64">passthrough</transport>
+ <impl level="generic"></impl>
+ <version>2.0</version>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.audio.effect</name>
+ <transport arch="32+64">passthrough</transport>
+ <impl level="generic"></impl>
+ <version>2.0</version>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.soundtrigger</name>
+ <transport arch="32+64">passthrough</transport>
+ <impl level="generic"></impl>
+ <version>2.0</version>
+ <interface>
+ <name>ISoundTriggerHw</name>
+ <instance>sound_trigger.primary</instance>
+ </interface>
+ </hal>
+ <!-- video omx hal -->
+ <hal format="hidl">
+ <name>android.hardware.media</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.media.omx</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ </hal>
+ <!-- /video omx hal -->
+ <!-- display -->
<hal format="hidl">
<name>android.hardware.graphics.allocator</name>
- <transport>toggled</transport>
+ <transport>hwbinder</transport>
<impl level="generic"></impl>
<version>2.0</version>
+ <interface>
+ <name>IAllocator</name>
+ <instance>default</instance>
+ </interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
- <transport>passthrough</transport>
+ <transport arch="32+64">passthrough</transport>
<impl level="generic"></impl>
<version>2.0</version>
+ <interface>
+ <name>IMapper</name>
+ <instance>default</instance>
+ </interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
- <transport>toggled</transport>
+ <transport>hwbinder</transport>
<impl level="generic"></impl>
<version>2.1</version>
+ <interface>
+ <name>IComposer</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.configstore</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ <interface>
+ <name>ISurfaceFlingerConfigs</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.light</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>2.0</version>
+ <interface>
+ <name>ILight</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.memtrack</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ <interface>
+ <name>IMemtrack</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <!-- /display -->
+ <hal format="hidl">
+ <name>android.hardware.sensors</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.camera.provider</name>
+ <transport arch="32+64">toggled</transport>
+ <impl level="generic"></impl>
+ <version>2.4</version>
+ <interface>
+ <name>ICameraProvider</name>
+ <instance>legacy/0</instance>
+ </interface>
+ </hal>
+ <!-- bluetooth -->
+ <hal format="hidl">
+ <name>android.hardware.bluetooth</name>
+ <transport arch="32+64">toggled</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ </hal>
+ <!-- bluetooth -->
+ <hal format="hidl">
+ <name>android.hardware.power</name>
+ <transport arch="32+64">passthrough</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.boot</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.health</name>
+ <transport>hwbinder</transport>
+ <impl level="generic"></impl>
+ <version>1.0</version>
</hal>
</manifest>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 03:17:42 +0000