diff options
-rw-r--r-- | bluetooth/bdroid_buildcfg.h | 22 | ||||
-rw-r--r-- | common.kl | 113 | ||||
-rw-r--r-- | device-common.mk | 14 | ||||
-rwxr-xr-x | fetch-vendor-package.sh | 8 | ||||
-rw-r--r-- | gralloc960/gralloc_helper.h | 2 | ||||
-rw-r--r-- | hikey.mk | 7 | ||||
-rw-r--r-- | hikey/BoardConfig.mk | 14 | ||||
-rw-r--r-- | hikey/device-hikey.mk | 2 | ||||
-rw-r--r-- | hikey960.mk | 33 | ||||
-rw-r--r-- | hikey960/BoardConfig.mk | 12 | ||||
-rw-r--r-- | hikey960/device-hikey960.mk | 15 | ||||
-rw-r--r-- | hikey960/fstab.hikey960 | 6 | ||||
-rw-r--r-- | init.common.rc | 1 | ||||
-rw-r--r-- | manifest.xml | 5 | ||||
-rw-r--r-- | product.prop | 35 | ||||
-rw-r--r-- | sepolicy/file_contexts | 4 | ||||
-rwxr-xr-x | vendor-package-ver.sh | 7 |
17 files changed, 145 insertions, 155 deletions
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 00000000..2315b3de --- /dev/null +++ b/bluetooth/bdroid_buildcfg.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 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. + */ + +#ifndef _BDROID_BUILDCFG_H +#define _BDROID_BUILDCFG_H + +#define BLE_VND_INCLUDED FALSE + +#endif 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/device-common.mk b/device-common.mk index 0e498f46..217994f2 100644 --- a/device-common.mk +++ b/device-common.mk @@ -28,17 +28,14 @@ ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSI include $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk ifneq ($(TARGET_LINARO_VENDOR_VERSION), $(EXPECTED_LINARO_VENDOR_VERSION)) $(warning TARGET_LINARO_VENDOR_VERSION ($(TARGET_LINARO_VENDOR_VERSION)) does not match exiting the build ($(EXPECTED_LINARO_VENDOR_VERSION)).) - $(warning Please download new binaries here:) - $(warning $(VND_PKG_URL) ) - $(warning And extract in the ANDROID_TOP_DIR) + $(warning Please download and extract the new binaries by running the following script:) + $(warning ./device/linaro/hikey/fetch-vendor-package.sh ) endif else $(warning Missing Linaro Vendor Package!) - $(warning Please download new binaries here:) - $(warning $(VND_PKG_URL) ) - $(warning And extract in the ANDROID_TOP_DIR) + $(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 @@ -271,3 +268,6 @@ PRODUCT_PACKAGES += \ # TODO: disable this service once we implement system suspend PRODUCT_PACKAGES += \ suspend_blocker + +TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/linaro/hikey/bluetooth diff --git a/fetch-vendor-package.sh b/fetch-vendor-package.sh index cbadbdeb..0a50853c 100755 --- a/fetch-vendor-package.sh +++ b/fetch-vendor-package.sh @@ -13,6 +13,14 @@ PKG_FILE=extract-linaro_devices-${EXPECTED_LINARO_VENDOR_VERSION} pushd ${ANDROID_BUILD_TOP} +# remove the older vendor-package, if any, because upstream +# mesa prebuilts in linaro-vendor-package ain't declared +# within a contained namespace and we can run into build +# errors because of redefinition of mesa prebuilt modules +# from the previous vendor-package. +# FIXME move mesa prebuilts from Android.mk to Android.bp +rm -rf ${ANDROID_BUILD_TOP}/vendor/linaro/ + if [ ! -e "${PKG_FILE}.tgz" ]; then curl -L ${VND_PKG_URL} -o ${PKG_FILE}.tgz fi diff --git a/gralloc960/gralloc_helper.h b/gralloc960/gralloc_helper.h index fea10e5e..3d2b4210 100644 --- a/gralloc960/gralloc_helper.h +++ b/gralloc960/gralloc_helper.h @@ -41,7 +41,7 @@ #define GRALLOC_ALIGN(value, base) (((value) + ((base)-1)) & ~((base)-1)) -#define GRALLOC_UNUSED(x) ((void)x) +#define GRALLOC_UNUSED(x) ((void)(x)) static inline size_t round_up_to_page_size(size_t x) { @@ -3,13 +3,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, device/linaro/hikey/hikey-common.mk) $(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey.mk) -#setup dm-verity configs -PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/f723d000.dwmmc0/by-name/system -PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc/f723d000.dwmmc0/by-name/vendor -$(call inherit-product, build/target/product/verity.mk) -PRODUCT_SUPPORTS_BOOT_SIGNER := false -PRODUCT_SUPPORTS_VERITY_FEC := false - PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=131072 PRODUCT_NAME := hikey diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index b30c3287..7c31ac76 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -10,20 +10,6 @@ BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey firmware_class.path=/vendor/f BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/f723d000.dwmmc0 BOARD_KERNEL_CMDLINE += console=ttyAMA3,115200 androidboot.console=ttyAMA3 -# On kernels before 4.14, enable dtb fstab with android-verity. On kernels >= -# 4.14, both dtb fstab and android-verity are deprecated, so until we have -# avb2 support in the bootloader, don't enable either feature. The ramdisk -# fstab needed for the new mechanism will be installed unconditionally; if -# dtb fstab is present, it will override it automatically. -ifneq ($(TARGET_KERNEL_USE),4.19) -ifneq ($(TARGET_KERNEL_USE),4.14) -BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab_v2 -BOARD_KERNEL_CMDLINE += rootwait ro root=/dev/dm-0 -BOARD_KERNEL_CMDLINE += dm=\"system none ro,0 1 android-verity 179:9\" -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true -endif -endif - ifneq ($(TARGET_SENSOR_MEZZANINE),) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE) endif 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.mk b/hikey960.mk index 3a58d251..1888158d 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -1,16 +1,45 @@ ifndef TARGET_KERNEL_USE -TARGET_KERNEL_USE=5.4 +TARGET_KERNEL_USE=5.10 endif LOCAL_KERNEL_HOME ?= device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE) TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL_HOME)/Image.gz-dtb TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi3660-hikey960.dtb ifndef HIKEY_USES_GKI - ifeq ($(TARGET_KERNEL_USE), 5.4) + ifeq ($(TARGET_KERNEL_USE), mainline) HIKEY_USES_GKI := true + else + KERNEL_MAJ := $(word 1, $(subst ., ,$(TARGET_KERNEL_USE))) + # kernel since 5.X should support GKI + # only 4.X kernels do not support GKI + ifneq ($(KERNEL_MAJ), 4) + HIKEY_USES_GKI := true + endif endif endif +# only kernels after 5.10 support KVM +ifndef HIKEY960_ENABLE_AVF + ifeq ($(TARGET_KERNEL_USE), mainline) + HIKEY960_ENABLE_AVF := true + else + KERNEL_MAJ := $(word 1, $(subst ., ,$(TARGET_KERNEL_USE))) + KERNEL_MIN := $(word 2, $(subst ., ,$(TARGET_KERNEL_USE))) + KER_GT_5 := $(shell [ $(KERNEL_MAJ) -gt 5 ] && echo true) + KER_GE_5_10 := $(shell [ $(KERNEL_MIN) -ge 10 ] && echo true) + + ifeq ($(KER_GT_5), true) + HIKEY960_ENABLE_AVF := true + else + ifeq ($(KERNEL_MAJ), 5) + # for kernel after 5.10 + ifeq ($(KER_GE_5_10),true) + HIKEY960_ENABLE_AVF := true + endif + endif # end for 5.10 + endif # end for 5.X + endif # end for mainline +endif # end for HIKEY960_ENABLE_AVF include $(LOCAL_PATH)/vendor-package-ver.mk diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk index f7deb4c1..71a6273f 100644 --- a/hikey960/BoardConfig.mk +++ b/hikey960/BoardConfig.mk @@ -12,6 +12,18 @@ BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 firmware_class.path=/vendo BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/ff3b0000.ufs BOARD_KERNEL_CMDLINE += loglevel=15 androidboot.slot_suffix=_a +ifeq ($(HIKEY960_ENABLE_AVF), true) +# The GKI kernel set protected mode by default via gki_defconfig, +# but hikey960 does not support the protected kvm mode, here overwriting +# to make it possible to play with AVF in the non-protected mode. +BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe +# hypervisor.version would be better to be the same as CROSVM_PLATFORM_VERSION in +# packages/modules/Virtualization/virtualizationmanager/src/crosvm.rs +BOARD_KERNEL_CMDLINE += androidboot.hypervisor.version=1.0.0 +BOARD_KERNEL_CMDLINE += androidboot.hypervisor.vm.supported=1 +BOARD_KERNEL_CMDLINE += androidboot.hypervisor.protected_vm.supported=0 +endif + ifeq ($(TARGET_BUILTIN_EDID), true) BOARD_KERNEL_CMDLINE += drm_kms_helper.edid_firmware=edid/1920x1080.bin endif diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index fba39a48..7d178801 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -14,6 +14,13 @@ # limitations under the License. # +ifeq ($(HIKEY960_ENABLE_AVF), true) +# Based on the instructions in the following link: +# https://android.googlesource.com/platform/packages/modules/Virtualization/+/refs/heads/master/microdroid/README.md +# Tested with the android13-5.10 and android-mainline kernels. +$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) +endif + # Enable Virtual A/B AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ @@ -24,6 +31,12 @@ AB_OTA_PARTITIONS += \ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) +# BootControl HAL +PRODUCT_PACKAGES += \ + android.hardware.boot@1.2-impl \ + android.hardware.boot@1.2-impl.recovery \ + android.hardware.boot@1.2-service + PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb @@ -33,7 +46,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 diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index ae250da1..96f9703d 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -7,7 +7,13 @@ #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait /dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1 latemount,wait,formattable,fileencryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption,quota +# Use the old cache partition for /metadata in order to support metadata encryption /dev/block/by-name/cache /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount,check +# since there is no misc partition created by the current prm_ptable file, +# and the vendor partition is not used after the dynamic partition support +# here use the vendor partition for the misc mountpoint as a temporary +# workaround for the bootcontrol hal enablement +/dev/block/by-name/vendor /misc emmc defaults defaults /devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/platform/soc/ff200000.hisi_usb/ff100000.dwc3/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata /devices/platform/soc/f4000000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/nvme/nvme* auto auto defaults voldmanaged=nvmedisk:auto,encryptable=userdata 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 diff --git a/manifest.xml b/manifest.xml index 91e16b97..09f5dab5 100644 --- a/manifest.xml +++ b/manifest.xml @@ -36,11 +36,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.broadcastradio</name> - <transport arch="32+64">passthrough</transport> - <version>1.0</version> - </hal> - <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> <version>1.3</version> diff --git a/product.prop b/product.prop new file mode 100644 index 00000000..d703af95 --- /dev/null +++ b/product.prop @@ -0,0 +1,35 @@ +# 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.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 diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 9592d82e..0d147d5a 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -36,9 +36,11 @@ /dev/block/platform/soc/f723d000\.dwmmc0/by-name/userdata u:object_r:userdata_block_device:s0 # for HiKey960 Board +# temporary workaround for metadata encryption support /dev/block/platform/soc/ff3b0000\.ufs/by-name/cache u:object_r:metadata_block_device:s0 /dev/block/platform/soc/ff3b0000\.ufs/by-name/userdata u:object_r:userdata_block_device:s0 - +# temporary workaround for the bootcontrol hal support after the dynamic partititon support +/dev/block/platform/soc/ff3b0000\.ufs/by-name/vendor u:object_r:misc_block_device:s0 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0 /vendor/bin/hw/android\.hardware\.power@1\.1-service\.hikey-common u:object_r:hal_power_default_exec:s0 diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh index 12f4a6f0..690f87ec 100755 --- a/vendor-package-ver.sh +++ b/vendor-package-ver.sh @@ -1,8 +1,9 @@ #!/bin/bash -export EXPECTED_LINARO_VENDOR_VERSION=20220210 -export EXPECTED_LINARO_VENDOR_SHA=75efc8471f299f64716140712c0785b8e8aeaf5aa7e389a6f12f78ad4962420740da32f4535d795006e78c5f0b77a1cee8c168192a87f668103c00d87d480e6d -export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220210.tgz +export EXPECTED_LINARO_VENDOR_VERSION=20221126 +#make sure to use sha512sum here +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 |