| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-01-17 11:22:10 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-01-17 11:22:10 (GMT) |
| commit | 19a9db216152970d4fa3fe415449f1fa3323e28f (patch) | |
| tree | 18f76477492bbbeeed5657c3d212b720e57673c2 | |
| parent | 2856ab46e66680ce70dc2a411a186f775781d786 (diff) | |
| parent | 82974e57421e5b941514f224c94e2478de1adebe (diff) | |
| download | common-19a9db216152970d4fa3fe415449f1fa3323e28f.zip common-19a9db216152970d4fa3fe415449f1fa3323e28f.tar.gz common-19a9db216152970d4fa3fe415449f1fa3323e28f.tar.bz2 | |
Merge "avb: add avb related board config for sm1 [3/5]" into partner-master-tv-dev
| -rwxr-xr-x | core_amlogic.mk | 3 | ||||
| -rwxr-xr-x | hidl_manifests/manifest_common.xml | 9 | ||||
| -rwxr-xr-x | products/mbox/sm1/sm1.mk | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 91e0388..8ffec96 100755 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -389,7 +389,8 @@ PRODUCT_PACKAGES += \ # HW Composer PRODUCT_PACKAGES += \ - android.hardware.graphics.composer@2.3-service.droidlogic + android.hardware.graphics.composer@2.3-impl \ + android.hardware.graphics.composer@2.3-service # dumpstate binderized PRODUCT_PACKAGES += \ diff --git a/hidl_manifests/manifest_common.xml b/hidl_manifests/manifest_common.xml index 552cfa5..c8261a6 100755 --- a/hidl_manifests/manifest_common.xml +++ b/hidl_manifests/manifest_common.xml @@ -139,6 +139,15 @@ <fqname>@1.2::ICryptoFactory/widevine</fqname> <fqname>@1.2::IDrmFactory/widevine</fqname> </hal> + <hal format="hidl"> + <name>android.hardware.graphics.composer</name> + <transport>hwbinder</transport> + <version>2.3</version> + <interface> + <name>IComposer</name> + <instance>default</instance> + </interface> + </hal> <hal> <name>android.hardware.tv.cec</name> <transport>hwbinder</transport> diff --git a/products/mbox/sm1/sm1.mk b/products/mbox/sm1/sm1.mk index d239d4d..0e115d9 100755 --- a/products/mbox/sm1/sm1.mk +++ b/products/mbox/sm1/sm1.mk @@ -98,6 +98,11 @@ BOARD_AVB_ENABLE := true BOARD_AVB_ALGORITHM := SHA256_RSA2048 BOARD_AVB_KEY_PATH := device/amlogic/common/security/testkey_rsa2048.pem BOARD_AVB_ROLLBACK_INDEX := 0 + +BOARD_AVB_RECOVERY_KEY_PATH := device/amlogic/common/security/testkey_rsa2048.pem +BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_RECOVERY_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) +BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 2 endif ifeq ($(BUILD_WITH_AVB),true) |