From 60d5b19d4017e6c965f028fd20f0a62611565566 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Wed, 2 Mar 2022 21:35:31 +0800 Subject: manifest.xml: update FCM Version to 4 for API LEVEL 29 Otherwise there will be a warning reported like this: [3730/14244] /bin/bash -c "BOARD_SEPOLICY_VERS=10000.0 PRODUCT_ENFORCE_VINTF_MANIFEST=true PRODUCT_SHIPPING_API_LEVEL=29 out/host/linux-x86/bin/assemble_vintf -o out/target/product/beagle_x15/gen/ETC/vendor_manifest.xml_intermediates/manifest.xml -i device/ti/beagle_x15/manifest.xml" Warning: Shipping API level == 29 requires Shipping FCM Version >= 4 (but is 3) Test: source/lunch/build, no such warning reported again during the build and it could boot to the homescreen Signed-off-by: Yongqin Liu Change-Id: I479278b6179e2293e16ec2dd183363c79a1894d6 --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index 5e1c19c..adf465f 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder -- cgit v1.2.3 From beef903ac7fbe760ff1e6a7b1d90c584d53be401 Mon Sep 17 00:00:00 2001 From: Vishal Mahaveer Date: Wed, 6 Jul 2016 15:00:26 -0400 Subject: am57xevm: add modetest to product packages Add modetest to list of product packages for installation. Test: installed at /data/nativetest/modetest/modetest on x15 build Change-Id: Idb859465d6bb9329982c93e2868a828922ffbfaf Signed-off-by: Vishal Mahaveer Signed-off-by: Praneeth Bajjuri Signed-off-by: Yongqin Liu --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index ed2122a..8bc3d53 100644 --- a/device.mk +++ b/device.mk @@ -76,6 +76,7 @@ PRODUCT_PACKAGES += \ android.hardware.boot@1.0-service \ android.hardware.fastboot@1.0 \ android.hardware.fastboot@1.0-impl-mock \ + modetest \ libdrm \ libdrm_omap \ gralloc.am57x \ -- cgit v1.2.3 From 1e61cb43ee50a28a8cae8ada590a7c86deac48fa Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Sun, 9 Oct 2022 15:15:02 +0800 Subject: manifest.xml: fix IMapper incompatible build error Like the error report by the build here: https://ci.android.com/builds/submitted/9155358/beagle_x15-userdebug/latest/view/logs/build_error.log ERROR: files are incompatible: Device manifest and framework compatibility matrix are incompatible: HALs incompatible. Matrix level = 4. Manifest level = 4. The following requirements are not met: android.hardware.graphics.mapper: required: @2.1::IMapper/default OR @3.0::IMapper/default OR @4.0::IMapper/default provided: @2.0::IMapper/default android.hardware.graphics.mapper@2.0::IMapper/default is deprecated; requires at least 2.1: Success INCOMPATIBLE Test: make droid & make dist Fixes: 60d5b19d4017 ("manifest.xml: update FCM Version to 4 for API LEVEL 29") Signed-off-by: Yongqin Liu Change-Id: Ifbf017727c4557029baee70b92d9c9f0e9462d84 --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index adf465f..760b16c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -60,7 +60,7 @@ android.hardware.graphics.mapper passthrough - 2.0 + 2.1 IMapper default -- cgit v1.2.3 From 69cfe72c7da9f2ab829ba97281c2195d779562f3 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Sun, 9 Oct 2022 16:59:39 +0800 Subject: X15: Update PRODUCT_SHIPPING_API_LEVEL to 30 and FCM to 5 Update PRODUCT_SHIPPING_API_LEVEL and FCM for hikey960 so they are at 30 and 5 respectively. Refered to the hikey change here: https://android-review.googlesource.com/c/device/linaro/hikey/+/1759049/1 Test: boot test to homescreen Signed-off-by: Yongqin Liu Change-Id: Ib73c960587d970deefbb6e7e48606ae580b6bfba --- device.mk | 23 ++++++++++++++++++----- manifest.xml | 22 ++-------------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/device.mk b/device.mk index ed2122a..5a34597 100644 --- a/device.mk +++ b/device.mk @@ -27,7 +27,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Adjust the dalvik heap to be appropriate for a tablet. $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk) -PRODUCT_SHIPPING_API_LEVEL := 29 +PRODUCT_SHIPPING_API_LEVEL := 30 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false # Set custom settings @@ -64,6 +64,17 @@ endif TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL) PRODUCT_COPY_FILES += $(LOCAL_KERNEL):kernel +# +# Power HAL +# +PRODUCT_PACKAGES += \ + android.hardware.power-service.example +# +# PowerStats HAL +# +PRODUCT_PACKAGES += \ + android.hardware.power.stats-service.example + # Graphics PRODUCT_PACKAGES += \ android.hardware.graphics.allocator@2.0-impl \ @@ -72,8 +83,9 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@2.0-service \ android.hardware.graphics.composer@2.1-impl \ android.hardware.graphics.composer@2.1-service \ - android.hardware.boot@1.0-impl:64 \ - android.hardware.boot@1.0-service \ + android.hardware.boot@1.2-impl:64 \ + android.hardware.boot@1.2-impl.recovery:64 \ + android.hardware.boot@1.2-service \ android.hardware.fastboot@1.0 \ android.hardware.fastboot@1.0-impl-mock \ libdrm \ @@ -106,8 +118,9 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.keymaster@3.0-impl \ android.hardware.keymaster@3.0-service \ - android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service \ + android.hardware.drm@1.3-service.clearkey \ + android.hardware.drm@1.3-service.widevine \ + # Audio PRODUCT_PACKAGES += \ diff --git a/manifest.xml b/manifest.xml index adf465f..bd5ef26 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder @@ -17,19 +17,10 @@ default - - android.hardware.configstore - hwbinder - 1.1 - - ISurfaceFlingerConfigs - default - - android.hardware.drm hwbinder - 1.0 + 1.3 ICryptoFactory default @@ -97,13 +88,4 @@ default - - android.hardware.boot - hwbinder - 1.0 - - IBootControl - default - - -- cgit v1.2.3 From 1a3678b99cfabe31f47a47e1cd0b2143e3b87410 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Sun, 9 Oct 2022 17:26:53 +0800 Subject: x15: Update PRODUCT_SHIPPING_API_LEVEL to 31 and FCM to 6 Update PRODUCT_SHIPPING_API_LEVEL and FCM for hikey960 so they are at 31 and 6 respectively. Refered to the hikey960 change here: https://android-review.googlesource.com/c/device/linaro/hikey/+/1759050/1 Test: boot to homescreen Signed-off-by: Yongqin Liu Change-Id: I57eb828c16a5d26eb8132edfd82f94a1076315be --- compatibility_matrix.xml | 8 -------- device.mk | 6 +----- manifest.xml | 11 +---------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml index 847f781..73d39a9 100644 --- a/compatibility_matrix.xml +++ b/compatibility_matrix.xml @@ -7,14 +7,6 @@ default - - android.frameworks.schedulerservice - 1.0 - - ISchedulingPolicyService - default - - android.frameworks.sensorservice 1.0 diff --git a/device.mk b/device.mk index 5a34597..94bdd19 100644 --- a/device.mk +++ b/device.mk @@ -27,7 +27,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Adjust the dalvik heap to be appropriate for a tablet. $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk) -PRODUCT_SHIPPING_API_LEVEL := 30 +PRODUCT_SHIPPING_API_LEVEL := 31 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false # Set custom settings @@ -139,10 +139,6 @@ PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ -# Memtrack -PRODUCT_PACKAGES += \ - android.hardware.memtrack@1.0-impl \ - android.hardware.memtrack@1.0-service \ PRODUCT_PROPERTY_OVERRIDES += \ ro.opengles.version=131072 \ diff --git a/manifest.xml b/manifest.xml index bd5ef26..5727775 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder @@ -79,13 +79,4 @@ default - - android.hardware.memtrack - hwbinder - 1.0 - - IMemtrack - default - - -- cgit v1.2.3 From 483b4aeab003854400607fd7adecebd2f7a4078a Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Sun, 9 Oct 2022 19:43:43 +0800 Subject: x15: shipping level to 32 As one step toward to 33 Test: boot to homescreen Signed-off-by: Yongqin Liu Change-Id: I60ee9f8a334e48d34c9aa03f72cd93a4b7d95801 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 94bdd19..a4487a0 100644 --- a/device.mk +++ b/device.mk @@ -27,7 +27,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Adjust the dalvik heap to be appropriate for a tablet. $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk) -PRODUCT_SHIPPING_API_LEVEL := 31 +PRODUCT_SHIPPING_API_LEVEL := 32 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false # Set custom settings -- cgit v1.2.3