From 5d0db1d5b3b4ec82065fac10acea1d386088d850 Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Fri, 4 Mar 2022 13:37:17 +0000 Subject: Removed audio A2dp and Hearing Aid from device.mk Bug: 220306859 Test: atest Tag: #feature Change-Id: I367897daaf7df76a33ed1e9f3cc7fc1d0ae0be44 --- device-common.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/device-common.mk b/device-common.mk index ec3d7939..3f9c282c 100644 --- a/device-common.mk +++ b/device-common.mk @@ -91,8 +91,7 @@ PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \ PRODUCT_RUNTIMES := runtime_libart_default # Build default bluetooth a2dp and usb audio HALs -PRODUCT_PACKAGES += audio.a2dp.default \ - audio.bluetooth.default \ +PRODUCT_PACKAGES += audio.bluetooth.default \ audio.usb.default \ audio.r_submix.default \ tinyplay -- cgit v1.2.3 From 905179db0a0e48cd3f40e2c7c88a3002a9b776c4 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 17 Aug 2022 16:32:56 +0530 Subject: init.common.rc: Use Supplicant AIDL interface Otherwise we run into following error on post Android 13 builds: "init: Control message: Could not find \ 'aidl/android.hardware.wifi.supplicant.ISupplicant/default' \ for ctl.interface_start from pid: 322 (/system/bin/servicemanager)" Signed-off-by: Amit Pundir Change-Id: Ib73738bbc5fb6665e68237502d9128ccee85315d --- init.common.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/init.common.rc b/init.common.rc index e864a645..ff39fbb2 100644 --- a/init.common.rc +++ b/init.common.rc @@ -98,6 +98,7 @@ service uim /vendor/bin/uim service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \ -g@android:wpa_wlan0 + interface aidl android.hardware.wifi.supplicant.ISupplicant/default interface android.hardware.wifi.supplicant@1.0::ISupplicant default interface android.hardware.wifi.supplicant@1.1::ISupplicant default socket wpa_wlan0 dgram 660 wifi wifi -- cgit v1.2.3 From 1b16de2f432e6dc0c5733b425d5feca8f59f0092 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Thu, 6 Oct 2022 15:02:41 +0800 Subject: manifest.xml: drop settings for android.hardware.broadcastradio as it seems not fully configured, and cause build errors like the following now: [ 85% 46356/54295] Install out/host/linux-x86/bin/checkvintf [ 85% 46357/54295] build out/target/product/hikey960/obj/PACKAGING/check_vintf_all_intermediates/check_vintf_vendor.log FAILED: out/target/product/hikey960/obj/PACKAGING/check_vintf_all_intermediates/check_vintf_vendor.log /bin/bash -c "( out/host/linux-x86/bin/checkvintf --check-one --dirmap /vendor:out/target/product/hikey960/vendor --property ro.boot.product.vendor.sku= > out/target/product/hikey960/obj/PACKAGING/check_vintf_all_intermediates/check_vintf_vendor.log 2>&1 ) || ( cat out/target/product/hikey960/obj/PACKAGING/check_vintf_all_intermediates/check_vintf_vendor.log && exit 1 )" Checking vendor manifest. getDeviceHalManifest: Reading VINTF information. Sysprop ro.boot.product.vendor.sku= Fetch 'out/target/product/hikey960/vendor/etc/vintf/manifest.xml': OK getDeviceHalManifest: status from fetching VINTF information: -22 getDeviceHalManifest: -22 VINTF parse error: Illformed file: /vendor/etc/vintf/manifest.xml: Could not parse element with name in element : android.hardware.broadcastradio has no instance. Fix by adding . ERROR: Cannot fetch vendor manifest. Checking vendor matrix. getDeviceCompatibilityMatrix: Reading VINTF information. Fetch 'out/target/product/hikey960/vendor/etc/vintf/compatibility_matrix.xml': OK getDeviceCompatibilityMatrix: Successfully processed VINTF information Test: build & boot test with hikey/hikey960 droid builds Signed-off-by: Yongqin Liu Change-Id: Iea64d64b848371b59b10f5da03aee71567d7901e --- manifest.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manifest.xml b/manifest.xml index 91e16b97..09f5dab5 100644 --- a/manifest.xml +++ b/manifest.xml @@ -35,11 +35,6 @@ default - - android.hardware.broadcastradio - passthrough - 1.0 - android.hardware.drm hwbinder -- cgit v1.2.3 From 9441a3a525365f21bb687f77922236e62fa6a559 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Sat, 1 Oct 2022 11:07:59 +0530 Subject: common.kl: Use frameworks/base/data/keyboards/Generic.kl instead Delete common.kl and use upstream generic keylayout from frameworks/base/data/keyboards/Generic.kl, instead of maintaining an out dated keylayout locally. Signed-off-by: Amit Pundir Change-Id: I630e670de262b2fc5f859dcd382d587e846d51c5 --- common.kl | 113 -------------------------------------------- hikey/device-hikey.mk | 2 +- hikey960/device-hikey960.mk | 2 +- 3 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 common.kl diff --git a/common.kl b/common.kl deleted file mode 100644 index a1302da2..00000000 --- a/common.kl +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright (C) 2010 The Android 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 399 GRAVE -key 1 BACK -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 158 BACK WAKE_DROPPED -key 230 SOFT_RIGHT WAKE -key 60 SOFT_RIGHT WAKE -key 107 ENDCALL WAKE_DROPPED -key 62 ENDCALL WAKE_DROPPED -key 229 MENU WAKE_DROPPED -key 139 MENU WAKE_DROPPED -key 59 MENU WAKE_DROPPED -key 127 SEARCH WAKE_DROPPED -key 217 SEARCH WAKE_DROPPED -key 228 POUND -key 227 STAR -key 231 CALL WAKE_DROPPED -key 61 CALL WAKE_DROPPED -key 232 DPAD_CENTER WAKE_DROPPED -key 108 DPAD_DOWN WAKE_DROPPED -key 103 DPAD_UP WAKE_DROPPED -key 102 HOME WAKE -key 105 DPAD_LEFT WAKE_DROPPED -key 106 DPAD_RIGHT WAKE_DROPPED -key 115 VOLUME_UP -key 114 VOLUME_DOWN -key 116 POWER WAKE -key 212 CAMERA - -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 43 BACKSLASH - -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 14 DEL - -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 28 ENTER - -key 56 ALT_LEFT -key 100 ALT_RIGHT -key 42 SHIFT_LEFT -key 54 SHIFT_RIGHT -key 15 TAB -key 57 SPACE -key 150 EXPLORER -key 155 ENVELOPE - -key 12 MINUS -key 13 EQUALS -key 215 AT - - -key 82 MENU WAKE diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk index cc94c401..55eaf72c 100644 --- a/hikey/device-hikey.mk +++ b/hikey/device-hikey.mk @@ -22,7 +22,7 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \ device/linaro/hikey/hikey/init.hikey.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ - device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey.kl + frameworks/base/data/keyboards/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey.kl # Build HiKey HDMI audio HAL PRODUCT_PACKAGES += audio.primary.hikey diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index b4d43b3f..d3118653 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -39,7 +39,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \ device/linaro/hikey/hikey960/init.hikey960.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ - device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \ + frameworks/base/data/keyboards/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml -- cgit v1.2.3 From f707942776d45d238e7fc143afa4a531c1cbdde3 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Mon, 3 Oct 2022 18:22:43 +0530 Subject: product.prop: Update bluetooth properties Set default Bluetooth class of device and update LE Audio profile properties to match spec and implementation. Copied from Cuttlefish. Signed-off-by: Amit Pundir Change-Id: Ic8a85d55888ecf7eeb24cd0c9d604d0d43a58ebc --- product.prop | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/product.prop b/product.prop index 2499291e..29b74bba 100644 --- a/product.prop +++ b/product.prop @@ -1,11 +1,22 @@ # System props to enable aac vbr feature persist.bluetooth.a2dp_aac.vbr_supported=true + +# Set the Bluetooth Class of Device +# Service Field: 0x5A -> 90 +# Bit 17: Networking +# Bit 19: Capturing +# Bit 20: Object Transfer +# Bit 22: Telephony +# MAJOR_CLASS: 0x02 -> 2 (Phone) +# MINOR_CLASS: 0x0C -> 12 (Smart Phone) +bluetooth.device.class_of_device=90,2,12 + # Set supported Bluetooth profiles to enabled bluetooth.profile.asha.central.enabled=true bluetooth.profile.a2dp.source.enabled=true bluetooth.profile.avrcp.target.enabled=true bluetooth.profile.bap.broadcast.assist.enabled=true -bluetooth.profile.bap.unicast.server.enabled=true +bluetooth.profile.bap.unicast.client.enabled=true bluetooth.profile.bas.client.enabled=true bluetooth.profile.csip.set_coordinator.enabled=true bluetooth.profile.gatt.enabled=true @@ -19,6 +30,5 @@ bluetooth.profile.opp.enabled=true bluetooth.profile.pan.nap.enabled=true bluetooth.profile.pan.panu.enabled=true bluetooth.profile.pbap.server.enabled=true -bluetooth.profile.sap.server.enabled=true -bluetooth.profile.tbs.server.enabled=true -bluetooth.profile.vc.server.enabled=true +bluetooth.profile.ccp.server.enabled=true +bluetooth.profile.vcp.controller.enabled=true -- cgit v1.2.3 From f7f8d93f06064ce6d3f176fff8673f740829a706 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 5 Oct 2022 17:36:20 +0530 Subject: product.prop: Use the ?= operator so BT properties can be overridden System properties set with the "=" operator cannot be overriden. This device is used elsewhere in the system and some of the properties need to be overridden. The "?=" operator will use the assigned value if no other values are assigned elsewhere, allowing for overrides. Copied from Coral. Signed-off-by: Amit Pundir Change-Id: I94f12152e778531525e7cdc6b0c9f835b9f665e4 --- product.prop | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/product.prop b/product.prop index 29b74bba..d703af95 100644 --- a/product.prop +++ b/product.prop @@ -12,23 +12,24 @@ persist.bluetooth.a2dp_aac.vbr_supported=true bluetooth.device.class_of_device=90,2,12 # Set supported Bluetooth profiles to enabled -bluetooth.profile.asha.central.enabled=true -bluetooth.profile.a2dp.source.enabled=true -bluetooth.profile.avrcp.target.enabled=true -bluetooth.profile.bap.broadcast.assist.enabled=true -bluetooth.profile.bap.unicast.client.enabled=true -bluetooth.profile.bas.client.enabled=true -bluetooth.profile.csip.set_coordinator.enabled=true -bluetooth.profile.gatt.enabled=true -bluetooth.profile.hap.client.enabled=true -bluetooth.profile.hfp.ag.enabled=true -bluetooth.profile.hid.device.enabled=true -bluetooth.profile.hid.host.enabled=true -bluetooth.profile.map.server.enabled=true -bluetooth.profile.mcp.server.enabled=true -bluetooth.profile.opp.enabled=true -bluetooth.profile.pan.nap.enabled=true -bluetooth.profile.pan.panu.enabled=true -bluetooth.profile.pbap.server.enabled=true -bluetooth.profile.ccp.server.enabled=true -bluetooth.profile.vcp.controller.enabled=true +bluetooth.profile.asha.central.enabled?=true +bluetooth.profile.a2dp.source.enabled?=true +bluetooth.profile.avrcp.target.enabled?=true +bluetooth.profile.bap.broadcast.assist.enabled?=true +bluetooth.profile.bap.unicast.client.enabled?=true +bluetooth.profile.bas.client.enabled?=true +bluetooth.profile.csip.set_coordinator.enabled?=true +bluetooth.profile.gatt.enabled?=true +bluetooth.profile.hap.client.enabled?=true +bluetooth.profile.hfp.ag.enabled?=true +bluetooth.profile.hid.device.enabled?=true +bluetooth.profile.hid.host.enabled?=true +bluetooth.profile.map.server.enabled?=true +bluetooth.profile.mcp.server.enabled?=true +bluetooth.profile.opp.enabled?=true +bluetooth.profile.pan.nap.enabled?=true +bluetooth.profile.pan.panu.enabled?=true +bluetooth.profile.pbap.server.enabled?=true +bluetooth.profile.sap.server.enabled?=true +bluetooth.profile.ccp.server.enabled?=true +bluetooth.profile.vcp.controller.enabled?=true -- cgit v1.2.3 From b9e273a1904700458d1216640a00baa81f3c4c03 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 12 Oct 2022 22:40:51 +0530 Subject: hikey/hikey960: Update vendor-package to 20221011 release No functional changes. Updating to the 20221011 version release to keep in sync with the dragonboard vendor-package version updates. Also removed a warning (which should have been an "info" rather than a "warning" to begin with) from device-common.mk, because it creates un-necessary confusion during build time. Update to the 20221011 release, which: * Copy RB5 WiFi-BT firmware files to vendor-ramdisk.img to drop the dependency on user sysfs fw loader helper (FW_LOADER_USER_HELPER_FALLBACK). * Update mesa prebuilt binaries to upstream commit 55f6a2bb51a1 ("gallium: normalized_coords -> unnormalized_coords"). Note: mesa/main build, however, is broken due to deprecated libbacktrace in AOSP https://gitlab.freedesktop.org/mesa/mesa/-/issues/7465 vendor-package binary: https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20221011.tgz vendor-package source: https://gitlab.com/LinaroLtd/linaro-aosp/linaro-vendor-package/-/commits/master Signed-off-by: Amit Pundir Change-Id: I3b790719605a2779afb8e55fc4f4a206602a654d --- device-common.mk | 1 - vendor-package-ver.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/device-common.mk b/device-common.mk index 124e078d..217994f2 100644 --- a/device-common.mk +++ b/device-common.mk @@ -36,7 +36,6 @@ else $(warning Please download and extract the vendor binaries by running the following script:) $(warning ./device/linaro/hikey/fetch-vendor-package.sh ) endif -$(warning EXPECTED_LINARO_VENDOR_VERSION=$(EXPECTED_LINARO_VENDOR_VERSION)) ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv)) # Setup TV Build diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh index 35b3ae49..0af2041d 100755 --- a/vendor-package-ver.sh +++ b/vendor-package-ver.sh @@ -1,9 +1,9 @@ #!/bin/bash -export EXPECTED_LINARO_VENDOR_VERSION=20220726 +export EXPECTED_LINARO_VENDOR_VERSION=20221011 #make sure to use sha512sum here -export EXPECTED_LINARO_VENDOR_SHA=62ff5d98eb9ab568aff035857379fa1cc2dbd69e5cdb13124e577ac1abd70ff21013c19956b5ae9834e1f5dbed672f52663c22d404c060c2cb7fff8aa85067f1 -export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220726.tgz +export EXPECTED_LINARO_VENDOR_SHA=aa7cc267985be207beac3c67c80ce9bffb12562fa970de49f3832f997996a03299147b94e24738c74d2a68783f29129ba6ac127146b730a5c10b6eb8f1d0da51 +export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20221011.tgz if [ "$1" = "url" ]; then echo $VND_PKG_URL -- cgit v1.2.3 From d72eb770acd438895ea2397608563957f9efa1b1 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Fri, 2 Dec 2022 15:15:01 +0530 Subject: hikey/hikey960: Update vendor-package to 20221126 release No functional changes. Updating to the 20221126 version release to keep in sync with the dragonboard vendor-package version updates. Update to the 20221126 release, which update mesa prebuilt binaries to upstream commit c70eec86efd9 (st/vdpau: fix interop with GL). Note: mesa/main build, however, is broken due to deprecated libbacktrace in AOSP https://gitlab.freedesktop.org/mesa/mesa/-/issues/7465 and has a hard dependency on meson version >= 0.54 now. vendor-package binary: https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20221126.tgz vendor-package source: https://gitlab.com/LinaroLtd/linaro-aosp/linaro-vendor-package/-/commits/master Change-Id: Ibee137261ef247fe0248c58f9f47386826fdbdb5 Signed-off-by: Amit Pundir --- vendor-package-ver.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh index 0af2041d..690f87ec 100755 --- a/vendor-package-ver.sh +++ b/vendor-package-ver.sh @@ -1,9 +1,9 @@ #!/bin/bash -export EXPECTED_LINARO_VENDOR_VERSION=20221011 +export EXPECTED_LINARO_VENDOR_VERSION=20221126 #make sure to use sha512sum here -export EXPECTED_LINARO_VENDOR_SHA=aa7cc267985be207beac3c67c80ce9bffb12562fa970de49f3832f997996a03299147b94e24738c74d2a68783f29129ba6ac127146b730a5c10b6eb8f1d0da51 -export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20221011.tgz +export EXPECTED_LINARO_VENDOR_SHA=b87346f0612809458f556d0770f32a542ffd200418fe89bf1bf11b250f8c9197cd7c3624c87d141837c315a308d166129f711cf8c7b0a31eafcc1c2b87556199 +export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20221126.tgz if [ "$1" = "url" ]; then echo $VND_PKG_URL -- cgit v1.2.3 From ca30a6e8038596ff57016080d392d49bd20aead2 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Tue, 3 Jan 2023 17:28:09 +0800 Subject: hikey960.mk: set HIKEY_USES_GKI true for mainline kernel to avoid invonvenience when forgot to set explicitly, which will cause boot failures on the adb connections Test: booted to homescreen with the mainline kernel and adb connection works Change-Id: I07e22d831a747915e7926fba584b0665c1d3f558 Signed-off-by: Yongqin Liu --- hikey960.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hikey960.mk b/hikey960.mk index 3a58d251..673181c6 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -8,6 +8,10 @@ TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi3660-hikey960.dtb ifndef HIKEY_USES_GKI ifeq ($(TARGET_KERNEL_USE), 5.4) HIKEY_USES_GKI := true + else + ifeq ($(TARGET_KERNEL_USE), mainline) + HIKEY_USES_GKI := true + endif endif endif -- cgit v1.2.3