commit 6a405037922c55c1ae0e5b1791efafb659b2aa04
author nagendra modadugu <ngm@google.com> Thu Jan 23 14:48:29 2020 -0800
committer nagendra modadugu <ngm@google.com> Mon Mar 23 12:27:57 2020 -0700
tree 2f1a3caed1df0f168826b5ee3e9ac5657e775ae3
parent 0f09ded0037cfa06e881d204b4c3de1594f18bc1

manifest.xml: switch keymaster/strongbox 4.0 to 4.1

Switch strongbox over to the KM4.1 HAL.

Bug: 136506341
Test: -userdebug builds, device boots, KM 4.0 VTS pass;
       4.1 VTS pending
Change-Id: Ie3c54f5760793e297d94d477f981d24e9155cb2e

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 647c298..a99b68c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -100,7 +100,7 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/android.hardware.graphics.composer@2.1-impl.so)
 
 # Remove StrongBox RC
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.citadel.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.1-service.citadel.rc)
 
 # Migrate to versioned VNDK directory
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp)

device.mk

diff --git a/device.mk b/device.mk
index 8bacd21..7e07433 100644
--- a/device.mk
+++ b/device.mk
@@ -674,7 +674,7 @@
     android.hardware.authsecret@1.0-service.citadel \
     android.hardware.oemlock@1.0-service.citadel \
     android.hardware.weaver@1.0-service.citadel \
-    android.hardware.keymaster@4.0-service.citadel \
+    android.hardware.keymaster@4.1-service.citadel \
     wait_for_strongbox
 
 # Citadel debug stuff

init.hardware.rc

diff --git a/init.hardware.rc b/init.hardware.rc
index acc75a3..9d98aa3 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -81,7 +81,7 @@
 
     # start Citadel keymaster (StrongBox) early
     start vendor.citadeld
-    start vendor.keymaster-4-0-citadel
+    start vendor.keymaster-4-1-citadel
 
     # Boot time fs tune
     write /sys/block/sda/queue/iostats 0

keymaster/Android.bp

diff --git a/keymaster/Android.bp b/keymaster/Android.bp
index 30952a6..afbfc41 100644
--- a/keymaster/Android.bp
+++ b/keymaster/Android.bp
@@ -19,7 +19,7 @@
     srcs: [ "wait_for_strongbox.cpp" ],
     cflags: [ "-Werror", "-Wall" ],
     shared_libs: [
-        "android.hardware.keymaster@4.0",
+        "android.hardware.keymaster@4.1",
         "libbase",
         "libkeymaster4_1support",
         "libutils",

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 548ab9c..08ff870 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -170,12 +170,8 @@
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-            <instance>strongbox</instance>
-        </interface>
+        <fqname>@4.0::IKeymasterDevice/default</fqname>
+        <fqname>@4.1::IKeymasterDevice/strongbox</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>